diff options
author | Winson Chung <winsonc@google.com> | 2011-08-09 17:31:00 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-09 17:31:00 -0700 |
commit | da310680c5729710d9ee4d0d2d7c1c1117060ad8 (patch) | |
tree | 520c19547405d08f77c88e206b8a8a9b629e14d9 /src/com/android/launcher2/Launcher.java | |
parent | d771c96e5d156ffde5d35ee13ce053de60dc3163 (diff) | |
parent | c100e8eae7d67ad5bd78767494b62b8fae5d1779 (diff) | |
download | android_packages_apps_Trebuchet-da310680c5729710d9ee4d0d2d7c1c1117060ad8.tar.gz android_packages_apps_Trebuchet-da310680c5729710d9ee4d0d2d7c1c1117060ad8.tar.bz2 android_packages_apps_Trebuchet-da310680c5729710d9ee4d0d2d7c1c1117060ad8.zip |
Merge "Tablet/AllApps fixes."
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 1b105d23a..414cf282b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -915,10 +915,11 @@ public final class Launcher extends Activity mDragLayer.clearAllResizeFrames(); updateRunning(); - // Reset AllApps to it's initial state only if we are not in the middle of + // Reset AllApps to its initial state only if we are not in the middle of // processing a multi-step drop - if (mAppsCustomizeContent != null && mPendingAddInfo.container == ItemInfo.NO_ID) { - mAppsCustomizeContent.reset(); + if (mAppsCustomizeTabHost != null && mPendingAddInfo.container == ItemInfo.NO_ID) { + mAppsCustomizeTabHost.reset(); + showWorkspace(false); } } else if (Intent.ACTION_USER_PRESENT.equals(action)) { mUserPresent = true; @@ -1091,8 +1092,8 @@ public final class Launcher extends Activity } // Reset AllApps to its initial state - if (mAppsCustomizeContent != null) { - mAppsCustomizeContent.reset(); + if (mAppsCustomizeTabHost != null) { + mAppsCustomizeTabHost.reset(); } } } @@ -2465,11 +2466,6 @@ public final class Launcher extends Activity sAppMarketIcon = updateTextButtonWithIconFromExternalActivity( R.id.market_button, activityName, R.drawable.ic_launcher_market_holo); marketButton.setVisibility(View.VISIBLE); - - // Remove the shop icon text in the Phone UI - if (!LauncherApplication.isScreenLarge()) { - ((TextView) marketButton).setText(""); - } } else { // We should hide and disable the view so that we don't try and restore the visibility // of it when we swap between drag & normal states from IconDropTarget subclasses. |