diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 24e3c78..81f2d53 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -661,8 +661,8 @@ public class NetworkControllerImpl extends BroadcastReceiver for (int i = start /* get out of normal index range */; i < start + num; i++) { subs.add(addSignalController(i, i)); } + mCallbackHandler.setSubs(subs); } - mCallbackHandler.setSubs(subs); } String nosim = args.getString("nosim"); if (nosim != null) { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java index ca6aaeb..3f5ca58 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java @@ -103,6 +103,11 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference @Override public boolean onPreferenceChange(Preference preference, Object newValue) { if (preference == mEnabledSwitch) { + if (newValue != Boolean.TRUE) { + // Make sure we aren't in demo mode when disabling it. + mOnSwitch.setChecked(false); + stopDemoMode(); + } setGlobal(DEMO_MODE_ALLOWED, newValue == Boolean.TRUE ? 1 : 0); } else if (preference == mOnSwitch) { if (newValue == Boolean.TRUE) { @@ -123,7 +128,7 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference getContext().sendBroadcast(intent); intent.putExtra(DemoMode.EXTRA_COMMAND, DemoMode.COMMAND_CLOCK); - intent.putExtra("hhmm", "0520"); + intent.putExtra("hhmm", "0600"); getContext().sendBroadcast(intent); intent.putExtra(DemoMode.EXTRA_COMMAND, DemoMode.COMMAND_NETWORK); |