diff options
| -rw-r--r-- | res/layout/all_apps.xml | 4 | ||||
| -rw-r--r-- | res/layout/search_container_all_apps.xml (renamed from res/layout/all_apps_search_container.xml) | 2 | ||||
| -rw-r--r-- | res/layout/search_container_workspace.xml (renamed from res/layout/qsb_container.xml) | 2 | ||||
| -rw-r--r-- | res/values-sw720dp/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/config.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 2 |
9 files changed, 17 insertions, 11 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 93662fc08..6340619ab 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -49,7 +49,7 @@ <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.allapps.AllAppsRecyclerView android:id="@+id/apps_list_view" - android:layout_below="@+id/search_container" + android:layout_below="@id/search_container_all_apps" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_horizontal|top" @@ -62,7 +62,7 @@ platform bug, which prevents using custom attributes in <include> tag --> <include layout="?android:attr/keyboardLayout" - android:id="@+id/search_container" /> + android:id="@id/search_container_all_apps" /> <include layout="@layout/all_apps_fast_scroller" /> diff --git a/res/layout/all_apps_search_container.xml b/res/layout/search_container_all_apps.xml index 2528034eb..c4305214d 100644 --- a/res/layout/all_apps_search_container.xml +++ b/res/layout/search_container_all_apps.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.allapps.search.AppsSearchContainerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_container" + android:id="@id/search_container_all_apps" android:layout_width="match_parent" android:layout_height="@dimen/all_apps_search_bar_height" android:layout_gravity="center|top" diff --git a/res/layout/qsb_container.xml b/res/layout/search_container_workspace.xml index 6fa843d63..1c617b174 100644 --- a/res/layout/qsb_container.xml +++ b/res/layout/search_container_workspace.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" - android:id="@+id/qsb_container" + android:id="@id/search_container_workspace" android:padding="0dp" > <fragment diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index bb0dbc221..72894dcf3 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -26,7 +26,7 @@ <item name="android:windowNoTitle">true</item> <item name="android:windowActionModeOverlay">true</item> <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item> - <item name="android:keyboardLayout">@layout/all_apps_search_container</item> + <item name="android:keyboardLayout">@layout/search_container_all_apps</item> </style> <!-- Workspace --> diff --git a/res/values/config.xml b/res/values/config.xml index db1a75da9..fe5af2875 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -140,4 +140,10 @@ <item type="id" name="action_resize" /> <item type="id" name="action_deep_shortcuts" /> <item type="id" name="action_dismiss_notification" /> + +<!-- QSB IDs. DO not change --> + <item type="id" name="search_container_workspace" /> + <item type="id" name="search_container_hotseat" /> + <item type="id" name="search_container_all_apps" /> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index d11b00208..01ae49df1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -25,7 +25,7 @@ <item name="android:windowShowWallpaper">true</item> <item name="android:windowNoTitle">true</item> <item name="android:colorEdgeEffect">#FF757575</item> - <item name="android:keyboardLayout">@layout/all_apps_search_container</item> + <item name="android:keyboardLayout">@layout/search_container_all_apps</item> </style> <style name="BaseLauncherThemeWithCustomAttrs" parent="@style/BaseLauncherTheme"> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 26c5c9d00..6ae4068c8 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -488,7 +488,7 @@ public class Launcher extends BaseActivity } @Override - public View findViewById(int id) { + public <T extends View> T findViewById(int id) { return mLauncherView.findViewById(id); } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 919c60a34..70f719cbd 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -598,12 +598,12 @@ public class Workspace extends PagedView // In transposed layout, we add the QSB in the Grid. As workspace does not touch the // edges, we do not need a full width QSB. qsb = LayoutInflater.from(getContext()) - .inflate(R.layout.qsb_container,firstPage, false); + .inflate(R.layout.search_container_workspace,firstPage, false); } CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(), 1); lp.canReorder = false; - if (!firstPage.addViewToCellLayout(qsb, 0, R.id.qsb_container, lp, true)) { + if (!firstPage.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true)) { Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout"); } } @@ -621,7 +621,7 @@ public class Workspace extends PagedView } // Recycle the QSB widget - View qsb = findViewById(R.id.qsb_container); + View qsb = findViewById(R.id.search_container_workspace); if (qsb != null) { ((ViewGroup) qsb.getParent()).removeView(qsb); } diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 189b9358f..7608fe644 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -230,7 +230,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc mAppsRecyclerView.addOnScrollListener(new SpringMotionOnScrollListener()); } - mSearchContainer = findViewById(R.id.search_container); + mSearchContainer = findViewById(R.id.search_container_all_apps); mSearchUiManager = (SearchUiManager) mSearchContainer; mSearchUiManager.initialize(mApps, mAppsRecyclerView); |