Tablet/AllApps fixes.
- Fixing regression where the power button did not dismiss Apps/Customize
- Fixing regression in number of icons in portrain in AC, and removing legacy peek var for calculations (5122724)
- Fixing spacing in shop button on tablet
- Fixing bug where the apps pane was being changed as we were animating (5139543)
Change-Id: I3a3e5f224fd92e99072c830d13423d195179e7c7
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 1b105d2..414cf28 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -915,10 +915,11 @@
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 @@
}
// Reset AllApps to its initial state
- if (mAppsCustomizeContent != null) {
- mAppsCustomizeContent.reset();
+ if (mAppsCustomizeTabHost != null) {
+ mAppsCustomizeTabHost.reset();
}
}
}
@@ -2465,11 +2466,6 @@
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.