Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix demo mode issues" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-07-13 16:22:35 +00:00
committed by Android (Google) Code Review
parent 4502bfb8fd 33b60bb45f
commit 28a07ff0e1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -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) {

7
packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java
View File

@@ -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);