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

Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-07-19 20:31:21 +00:00
committed by Android (Google) Code Review
parent f84c05c360 ee9fcf50be
commit 8933c41b35
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -352,20 +352,23 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
MetricsLogger.action(mContext, MetricsLogger.action(mContext,
MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH); MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
if (mSettingsButton.isTunerClick()) { if (mSettingsButton.isTunerClick()) {
mHost.startRunnableDismissingKeyguard(() -> post(() -> {
if (TunerService.isTunerEnabled(mContext)) { if (TunerService.isTunerEnabled(mContext)) {
TunerService.showResetRequest(mContext, new Runnable() { TunerService.showResetRequest(mContext, () -> {
@Override
public void run() {
// Relaunch settings so that the tuner disappears. // Relaunch settings so that the tuner disappears.
startSettingsActivity(); startSettingsActivity();
}
}); });
} else { } else {
Toast.makeText(getContext(), R.string.tuner_toast, Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), R.string.tuner_toast,
Toast.LENGTH_LONG).show();
TunerService.setTunerEnabled(mContext, true); TunerService.setTunerEnabled(mContext, true);
} }
}
startSettingsActivity(); startSettingsActivity();
}));
} else {
startSettingsActivity();
}
} else if (v == mAlarmStatus && mNextAlarm != null) { } else if (v == mAlarmStatus && mNextAlarm != null) {
PendingIntent showIntent = mNextAlarm.getShowIntent(); PendingIntent showIntent = mNextAlarm.getShowIntent();
if (showIntent != null && showIntent.isActivity()) { if (showIntent != null && showIntent.isActivity()) {