summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2016-07-19 12:39:58 -0400
committergitbuildkicker <android-build@google.com>2016-08-01 19:13:28 -0700
commit6ca6cd5a50311d58a1b7bf8fbef3f9aa29eadcd5 (patch)
treea24b770cd5f9affbbd26dde61d10df5be2b52c5b
parent91fc934bb2e5ea59929bb2f574de6db9b5100745 (diff)
downloadbase-6ca6cd5a50311d58a1b7bf8fbef3f9aa29eadcd5.tar.gz
Don't allow enable/disable of tuner on lockscreen
Change-Id: Id9748ea39a8fa03b67d3fa6f91da530dd5cf9409 Fixes: 30107438
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java25
1 files changed, 14 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
index e091d6dc5195..2de832926608 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
@@ -352,20 +352,23 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
MetricsLogger.action(mContext,
MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
if (mSettingsButton.isTunerClick()) {
- if (TunerService.isTunerEnabled(mContext)) {
- TunerService.showResetRequest(mContext, new Runnable() {
- @Override
- public void run() {
+ mHost.startRunnableDismissingKeyguard(() -> post(() -> {
+ if (TunerService.isTunerEnabled(mContext)) {
+ TunerService.showResetRequest(mContext, () -> {
// Relaunch settings so that the tuner disappears.
startSettingsActivity();
- }
- });
- } else {
- Toast.makeText(getContext(), R.string.tuner_toast, Toast.LENGTH_LONG).show();
- TunerService.setTunerEnabled(mContext, true);
- }
+ });
+ } else {
+ Toast.makeText(getContext(), R.string.tuner_toast,
+ Toast.LENGTH_LONG).show();
+ TunerService.setTunerEnabled(mContext, true);
+ }
+ startSettingsActivity();
+
+ }));
+ } else {
+ startSettingsActivity();
}
- startSettingsActivity();
} else if (v == mAlarmStatus && mNextAlarm != null) {
PendingIntent showIntent = mNextAlarm.getShowIntent();
if (showIntent != null && showIntent.isActivity()) {