summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-07-22 13:53:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-22 13:53:17 +0000
commit397572d9338f3432409b121db78cab8cf91ad77c (patch)
tree6f358e97c6c8409a45a489421e590dd3377ae84a /packages
parent06e950b9693ff302b9876e7c43cafa48b2653dfe (diff)
parentbfd2929d5d8080069e39979b6a008cd542169015 (diff)
downloadframeworks_base-397572d9338f3432409b121db78cab8cf91ad77c.zip
frameworks_base-397572d9338f3432409b121db78cab8cf91ad77c.tar.gz
frameworks_base-397572d9338f3432409b121db78cab8cf91ad77c.tar.bz2
am d851a8a6: Merge "QS: Move flashlight tile before location tile." into lmp-dev
* commit 'd851a8a69537b2343d892d4fbfbf274b98faf3ba': QS: Move flashlight tile before location tile.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
index a599070..b74aab7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -95,10 +95,10 @@ public class QSTileHost implements QSTile.Host {
mTiles.add(new CellularTile(this));
mTiles.add(new AirplaneModeTile(this));
mTiles.add(new RotationLockTile(this));
+ mTiles.add(new FlashlightTile(this));
mTiles.add(new LocationTile(this));
mTiles.add(new CastTile(this));
mTiles.add(new HotspotTile(this));
- mTiles.add(new FlashlightTile(this));
mUserTracker = new CurrentUserTracker(mContext) {
@Override