summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-07-13 22:39:29 (GMT)
committerMichael Bestas <mikeioannina@gmail.com>2014-07-14 17:18:21 (GMT)
commit7a1a596b98941f7bda517e5c401086e57c9dff61 (patch)
tree1b42468bc5de0635d28b0764107bf50a11e8cd61
parentdaf737a6b6827dd9d918ab6b9fd80778e376097a (diff)
downloadandroid_packages_apps_Trebuchet-7a1a596b98941f7bda517e5c401086e57c9dff61.zip
android_packages_apps_Trebuchet-7a1a596b98941f7bda517e5c401086e57c9dff61.tar.gz
android_packages_apps_Trebuchet-7a1a596b98941f7bda517e5c401086e57c9dff61.tar.bz2
Fix:
- For devices with HW menu button, pressing menu in app tray doesn't show overview settings panel. - When you click the widgets button from the expanded settings pane, the settings pane eats touch events even when the workspace goes back into normal mode. Change-Id: Ibf5f22c969f257ece72474c6ce91d7896aaba158
-rw-r--r--src/com/android/launcher3/Workspace.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0c1caee..63e893d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2500,10 +2500,11 @@ public class Workspace extends SmoothPagedView
float mOverviewPanelSlideScale = 1.0f;
- if (overviewToWorkspace) {
+ if (overviewToWorkspace || stateIsNormal) {
+ ((SlidingUpPanelLayout) overviewPanel).collapsePane();
overviewPanel.setScaleY(1.0f);
mOverviewPanelSlideScale = 3.0f;
- } else if (workspaceToOverview) {
+ } else if (workspaceToOverview || stateIsOverview) {
overviewPanel.setScaleY(3.0f);
mOverviewPanelSlideScale = 1.0f;
}
@@ -2515,7 +2516,7 @@ public class Workspace extends SmoothPagedView
overviewPanelScale.setListener(new AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
- if (workspaceToOverview) {
+ if (workspaceToOverview || stateIsOverview) {
overviewPanel.setAlpha(finalOverviewPanelAlpha);
AlphaUpdateListener.updateVisibility(overviewPanel);
}
@@ -2523,7 +2524,7 @@ public class Workspace extends SmoothPagedView
@Override
public void onAnimationEnd(Animator animation) {
- if (overviewToWorkspace) {
+ if (overviewToWorkspace || stateIsNormal) {
overviewPanel.setAlpha(finalOverviewPanelAlpha);
AlphaUpdateListener.updateVisibility(overviewPanel);
}