Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev (b9f06d82) · Commits · e / os / android_frameworks_base

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

+14 −11

Original line number	Diff line number	Diff line
		@@ -352,20 +352,23 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
		MetricsLogger.action(mContext,
		MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
		if (mSettingsButton.isTunerClick()) {
		mHost.startRunnableDismissingKeyguard(() -> post(() -> {
		if (TunerService.isTunerEnabled(mContext)) {
		TunerService.showResetRequest(mContext, new Runnable() {
		@Override
		public void run() {
		TunerService.showResetRequest(mContext, () -> {
		// Relaunch settings so that the tuner disappears.
		startSettingsActivity();
		}
		});
		} 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);
		}
		}
		startSettingsActivity();

		}));
		} else {
		startSettingsActivity();
		}
		} else if (v == mAlarmStatus && mNextAlarm != null) {
		PendingIntent showIntent = mNextAlarm.getShowIntent();
		if (showIntent != null && showIntent.isActivity()) {