openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby

This commit is contained in:
Hyunyoung Song 2015-06-18 22:07:08 +00:00 committed by Android (Google) Code Review
parent 7b933a5ef7 60331a9be7
commit c44de1adcf
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/launcher.xml
View File

@ -34,6 +34,7 @@
android:layout_height="52dp" /> android:layout_height="52dp" />
<!-- The workspace contains 5 screens of cells --> <!-- The workspace contains 5 screens of cells -->
<!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.Workspace <com.android.launcher3.Workspace
android:id="@+id/workspace" android:id="@+id/workspace"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -41,6 +42,7 @@
android:layout_gravity="center" android:layout_gravity="center"
launcher:defaultScreen="@integer/config_workspaceDefaultScreen" /> launcher:defaultScreen="@integer/config_workspaceDefaultScreen" />
<!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat" <include layout="@layout/hotseat"
android:id="@+id/hotseat" android:id="@+id/hotseat"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout-port/launcher.xml
View File

@ -35,6 +35,7 @@
android:layout_height="52dp" /> android:layout_height="52dp" />
<!-- The workspace contains 5 screens of cells --> <!-- The workspace contains 5 screens of cells -->
<!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.Workspace <com.android.launcher3.Workspace
android:id="@+id/workspace" android:id="@+id/workspace"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -43,6 +44,7 @@
launcher:pageIndicator="@+id/page_indicator"> launcher:pageIndicator="@+id/page_indicator">
</com.android.launcher3.Workspace> </com.android.launcher3.Workspace>
<!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat" <include layout="@layout/hotseat"
android:id="@+id/hotseat" android:id="@+id/hotseat"
android:layout_width="match_parent" android:layout_width="match_parent"

5
res/layout-sw720dp/launcher.xml
View File

@ -35,6 +35,7 @@
android:layout_height="52dp" /> android:layout_height="52dp" />
<!-- The workspace contains 5 screens of cells --> <!-- The workspace contains 5 screens of cells -->
<!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.Workspace <com.android.launcher3.Workspace
android:id="@+id/workspace" android:id="@+id/workspace"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -43,6 +44,7 @@
launcher:pageIndicator="@id/page_indicator"> launcher:pageIndicator="@id/page_indicator">
</com.android.launcher3.Workspace> </com.android.launcher3.Workspace>
<!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat" <include layout="@layout/hotseat"
android:id="@+id/hotseat" android:id="@+id/hotseat"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -58,8 +60,7 @@
<!-- Keep these behind the workspace so that they are not visible when <!-- Keep these behind the workspace so that they are not visible when
we go into AllApps --> we go into AllApps -->
<include <include android:id="@+id/page_indicator"
android:id="@+id/page_indicator"
layout="@layout/page_indicator" layout="@layout/page_indicator"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

3
res/layout/all_apps_container.xml
View File

@ -24,8 +24,9 @@
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true"> android:focusableInTouchMode="true">
<!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.allapps.AllAppsRecyclerView <com.android.launcher3.allapps.AllAppsRecyclerView
android:id="@+id/collection" android:id="@+id/apps_list_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_horizontal|top" android:layout_gravity="center_horizontal|top"

1
res/layout/widgets_view.xml
View File

@ -37,6 +37,7 @@
android:elevation="2dp" android:elevation="2dp"
android:visibility="invisible" /> android:visibility="invisible" />
<!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.widget.WidgetsRecyclerView <com.android.launcher3.widget.WidgetsRecyclerView
android:id="@+id/widgets_list_view" android:id="@+id/widgets_list_view"
android:layout_width="match_parent" android:layout_width="match_parent"

2
src/com/android/launcher3/allapps/AllAppsContainerView.java
View File

@ -328,7 +328,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
mRevealView = findViewById(R.id.all_apps_reveal); mRevealView = findViewById(R.id.all_apps_reveal);
// Load the all apps recycler view // Load the all apps recycler view
mAppsRecyclerView = (AllAppsRecyclerView) findViewById(R.id.collection); mAppsRecyclerView = (AllAppsRecyclerView) findViewById(R.id.apps_list_view);
mAppsRecyclerView.setApps(mApps); mAppsRecyclerView.setApps(mApps);
mAppsRecyclerView.setPredictionBarHeight(mPredictionBarHeight); mAppsRecyclerView.setPredictionBarHeight(mPredictionBarHeight);
mAppsRecyclerView.setLayoutManager(mLayoutManager); mAppsRecyclerView.setLayoutManager(mLayoutManager);