diff options
| author | Tony Wickham <twickham@google.com> | 2015-11-19 00:36:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-19 00:36:20 +0000 |
| commit | 55bd16bfdce57772691519fb894b95c7f088846e (patch) | |
| tree | 7611eab056ab3dac1dbcdc2d9eb519412fe9241f | |
| parent | 0151ff168368883301e84c7d1f790c9f2721e459 (diff) | |
| parent | 30bdd6eb6994b89c99f3adaebd1de131d68d0545 (diff) | |
| download | android_packages_apps_Trebuchet-55bd16bfdce57772691519fb894b95c7f088846e.tar.gz android_packages_apps_Trebuchet-55bd16bfdce57772691519fb894b95c7f088846e.tar.bz2 android_packages_apps_Trebuchet-55bd16bfdce57772691519fb894b95c7f088846e.zip | |
Merge "Stop requesting focus on folder if it was closed without animating." into ub-launcher3-burnaby-polish
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 2b51d2cca..411f20080 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -640,7 +640,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList @Override public void onAnimationEnd(Animator animation) { setLayerType(LAYER_TYPE_NONE, null); - close(); + close(true); } @Override public void onAnimationStart(Animator animation) { @@ -654,7 +654,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList oa.start(); } - public void close() { + public void close(boolean wasAnimated) { // TODO: Clear all active animations. DragLayer parent = (DragLayer) getParent(); if (parent != null) { @@ -662,7 +662,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } mDragController.removeDropTarget(this); clearFocus(); - mFolderIcon.requestFocus(); + if (wasAnimated) { + mFolderIcon.requestFocus(); + } if (mRearrangeOnClose) { rearrangeChildren(); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 9824e3e3e..0721cd282 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3226,7 +3226,7 @@ public class Launcher extends Activity if (animate) { folder.animateClosed(); } else { - folder.close(); + folder.close(false); } // Notify the accessibility manager that this folder "window" has disappeared and no |