summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/qs
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-07-14 20:23:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-14 20:23:50 +0000
commit5cf30c608f21a9685310e6cf7d5970c8b7fb36c8 (patch)
tree62f0cb8fd0c238acff7f8208287000e63b28ab5f /packages/SystemUI/src/com/android/systemui/qs
parent353886b2dd1d6751d83469ddd3eb01dd0039231e (diff)
parentb8a46a6c77bcb4a6d837c6ddfc4418a21022949a (diff)
downloadframeworks_base-5cf30c608f21a9685310e6cf7d5970c8b7fb36c8.zip
frameworks_base-5cf30c608f21a9685310e6cf7d5970c8b7fb36c8.tar.gz
frameworks_base-5cf30c608f21a9685310e6cf7d5970c8b7fb36c8.tar.bz2
Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
index f28a24b..ddde106 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -94,7 +94,11 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed();
state.label = mContext.getString(R.string.quick_settings_hotspot_label);
- state.value = mController.isHotspotEnabled();
+ if (arg instanceof Boolean) {
+ state.value = (boolean) arg;
+ } else {
+ mController.isHotspotEnabled();
+ }
state.icon = state.visible && state.value ? mEnable : mDisable;
}
@@ -120,7 +124,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
private final class Callback implements HotspotController.Callback {
@Override
public void onHotspotChanged(boolean enabled) {
- refreshState();
+ refreshState(enabled);
}
};