diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-27 11:11:03 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-06-27 11:11:32 -0700 |
commit | c7b8df83297b1e765ee25871c4c796ee6a8440df (patch) | |
tree | e45f882924336d834807d86b8420a55b44a75bd8 /src/com/android | |
parent | 89b5b918f006fffa83203a981055a754a8210128 (diff) | |
download | android_packages_apps_Trebuchet-c7b8df83297b1e765ee25871c4c796ee6a8440df.tar.gz android_packages_apps_Trebuchet-c7b8df83297b1e765ee25871c4c796ee6a8440df.tar.bz2 android_packages_apps_Trebuchet-c7b8df83297b1e765ee25871c4c796ee6a8440df.zip |
Sanitizing various search container ids and layout names
Bug: 63014381
Change-Id: Ia75a8a048c7a85c6324f8861abd2bcf1721032fa
Diffstat (limited to 'src/com/android')
-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 |
3 files changed, 5 insertions, 5 deletions
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); |