diff options
| author | John Spurlock <jspurlock@google.com> | 2014-08-28 18:30:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 18:30:29 +0000 |
| commit | 832d351ca5e52aad640989c4b16298d3a9d119b6 (patch) | |
| tree | bac696ba9c1f98a5a648ff7fdda50e7e48f96039 | |
| parent | b712458362af70b93c144f614602fd80b063d191 (diff) | |
| parent | d21df6076fe16c570575b4c24618d0dc50a12d14 (diff) | |
| download | frameworks_base-832d351ca5e52aad640989c4b16298d3a9d119b6.zip frameworks_base-832d351ca5e52aad640989c4b16298d3a9d119b6.tar.gz frameworks_base-832d351ca5e52aad640989c4b16298d3a9d119b6.tar.bz2 | |
Merge "QS: Don't collapse the panel when turning location on." into lmp-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index 7ac6644..46d8a9b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -54,12 +54,7 @@ public class LocationTile extends QSTile<QSTile.BooleanState> { @Override protected void handleClick() { final boolean wasEnabled = (Boolean) mState.value; - final boolean changed = mController.setLocationEnabled(!wasEnabled); - if (!wasEnabled && changed) { - // If we've successfully switched from location off to on, close the - // notifications tray to show the network location provider consent dialog. - mHost.collapsePanels(); - } + mController.setLocationEnabled(!wasEnabled); } @Override |