diff options
| author | Michael Kolb <kolby@google.com> | 2012-04-23 13:59:39 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2012-04-23 13:59:39 -0700 |
| commit | ee8ede1146cefb85d0b9e7f1fc796fcc8808629a (patch) | |
| tree | 081ab1c10348f32e8659c5f5c5127c61f1ddc3e1 /src/com/android/browser/view | |
| parent | 877a04472506ae4ce288664f7cf321bf9bae3c4e (diff) | |
| download | packages_apps_Browser-ee8ede1146cefb85d0b9e7f1fc796fcc8808629a.zip packages_apps_Browser-ee8ede1146cefb85d0b9e7f1fc796fcc8808629a.tar.gz packages_apps_Browser-ee8ede1146cefb85d0b9e7f1fc796fcc8808629a.tar.bz2 | |
Ensure clean state of QuickControls when opening
Change-Id: I25e0ec85a9d249211ea763e2a6846211b273b54d
Diffstat (limited to 'src/com/android/browser/view')
| -rw-r--r-- | src/com/android/browser/view/PieMenu.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/browser/view/PieMenu.java b/src/com/android/browser/view/PieMenu.java index 1fd0e99..e41ebb2 100644 --- a/src/com/android/browser/view/PieMenu.java +++ b/src/com/android/browser/view/PieMenu.java @@ -194,20 +194,22 @@ public class PieMenu extends FrameLayout { private void show(boolean show) { mOpen = show; if (mOpen) { + // ensure clean state + mAnimating = false; + mCurrentItem = null; + mOpenItem = null; + mPieView = null; mController.stopEditingUrl(); mCurrentItems = mItems; + for (PieItem item : mCurrentItems) { + item.setSelected(false); + } if (mController != null) { boolean changed = mController.onOpen(); } layoutPie(); animateOpen(); } - if (!show) { - mAnimating = false; - mCurrentItem = null; - mOpenItem = null; - mPieView = null; - } invalidate(); } |