diff options
author | Adam Cohen <adamcohen@google.com> | 2014-09-09 15:41:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 15:41:27 +0000 |
commit | f7ce4d4e1591e7ad94ce1f1452dfa33cd64e2ae4 (patch) | |
tree | 2f150c031cb768b63f89123ac25a81845d93d703 | |
parent | b6711ac01cfc7ac507e6c01c0aba4670178a5cab (diff) | |
parent | 8e894faadfce1d779b94692d8c7eccf558e23727 (diff) | |
download | android_packages_apps_Trebuchet-f7ce4d4e1591e7ad94ce1f1452dfa33cd64e2ae4.tar.gz android_packages_apps_Trebuchet-f7ce4d4e1591e7ad94ce1f1452dfa33cd64e2ae4.tar.bz2 android_packages_apps_Trebuchet-f7ce4d4e1591e7ad94ce1f1452dfa33cd64e2ae4.zip |
am 8e894faa: Fixing a couple issues with bad AllApps state
* commit '8e894faadfce1d779b94692d8c7eccf558e23727':
Fixing a couple issues with bad AllApps state
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 5c6261dc5..1b95c2b3f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3469,6 +3469,15 @@ public class Launcher extends Activity fromView.findViewById(R.id.apps_customize_pane_content); final View page = content.getPageAt(content.getNextPage()); + + // We need to hide side pages of the Apps / Widget tray to avoid some ugly edge cases + int count = content.getChildCount(); + for (int i = 0; i < count; i++) { + View child = content.getChildAt(i); + if (child != page) { + child.setVisibility(View.INVISIBLE); + } + } final View revealView = fromView.findViewById(R.id.fake_page); // hideAppsCustomizeHelper is called in some cases when it is already hidden @@ -3615,6 +3624,19 @@ public class Launcher extends Activity page.setLayerType(View.LAYER_TYPE_NONE, null); } content.setPageBackgroundsVisible(true); + // Unhide side pages + int count = content.getChildCount(); + for (int i = 0; i < count; i++) { + View child = content.getChildAt(i); + child.setVisibility(View.VISIBLE); + } + + // Reset page transforms + page.setTranslationX(0); + page.setTranslationY(0); + page.setAlpha(1); + content.setCurrentPage(content.getNextPage()); + mAppsCustomizeContent.updateCurrentPageScroll(); } }); |