diff options
author | Adam Cohen <adamcohen@google.com> | 2014-01-14 16:18:14 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-01-14 16:33:50 -0800 |
commit | 24ce0b3708b44e738d6ee52477aa4dd917b547e7 (patch) | |
tree | 85759cea4e9b23690e347ebaef6ba3da2df1d8fa /src/com/android/launcher3/Launcher.java | |
parent | 13b563bcae015646d19fa9cf2baf7437d4711f8e (diff) | |
download | android_packages_apps_Trebuchet-24ce0b3708b44e738d6ee52477aa4dd917b547e7.tar.gz android_packages_apps_Trebuchet-24ce0b3708b44e738d6ee52477aa4dd917b547e7.tar.bz2 android_packages_apps_Trebuchet-24ce0b3708b44e738d6ee52477aa4dd917b547e7.zip |
Fixing drop targets in phone / small tablet landscape (issue 12192781)
Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7ef812f85..336cf9e7a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -256,7 +256,7 @@ public class Launcher extends Activity private AppsCustomizeTabHost mAppsCustomizeTabHost; private AppsCustomizePagedView mAppsCustomizeContent; private boolean mAutoAdvanceRunning = false; - private View mQsbBar; + private View mQsb; private Bundle mSavedState; // We set the state in both onCreate and then onNewIntent in some cases, which causes both @@ -1284,7 +1284,8 @@ public class Launcher extends Activity dragController.addDragListener(mWorkspace); // Get the search/delete bar - mSearchDropTargetBar = (SearchDropTargetBar) mDragLayer.findViewById(R.id.qsb_bar); + mSearchDropTargetBar = (SearchDropTargetBar) + mDragLayer.findViewById(R.id.search_drop_target_bar); // Setup AppsCustomize mAppsCustomizeTabHost = (AppsCustomizeTabHost) findViewById(R.id.apps_customize_pane); @@ -3458,11 +3459,11 @@ public class Launcher extends Activity } public View getQsbBar() { - if (mQsbBar == null) { - mQsbBar = mInflater.inflate(R.layout.search_bar, mSearchDropTargetBar, false); - mSearchDropTargetBar.addView(mQsbBar); + if (mQsb == null) { + mQsb = mInflater.inflate(R.layout.qsb, mSearchDropTargetBar, false); + mSearchDropTargetBar.addView(mQsb); } - return mQsbBar; + return mQsb; } protected boolean updateGlobalSearchIcon() { |