Merge "Block brightness slider quick settings when DISALLOW_CONFIG_BRIGHTNESS is set." (d4739e1d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne
		}

		public void refreshAllTiles() {
		mBrightnessController.checkRestrictionAndSetEnabled();
		for (TileRecord r : mRecords) {
		r.tile.refreshState();
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.os.PowerManager;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.service.vr.IVrManager;
		import android.service.vr.IVrStateCallbacks;
		@@ -39,6 +40,7 @@ import android.widget.ImageView;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.systemui.Dependency;

		import java.util.ArrayList;
		@@ -384,6 +386,18 @@ public class BrightnessController implements ToggleSlider.Listener {
		}
		}

		public void checkRestrictionAndSetEnabled() {
		mBackgroundHandler.post(new Runnable() {
		@Override
		public void run() {
		((ToggleSliderView)mControl).setEnforcedAdmin(
		RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
		UserManager.DISALLOW_CONFIG_BRIGHTNESS,
		mUserTracker.getCurrentUserId()));
		}
		});
		}

		private void setMode(int mode) {
		Settings.System.putIntForUser(mContext.getContentResolver(),
		Settings.System.SCREEN_BRIGHTNESS_MODE, mode,

+17 −0

Original line number	Diff line number	Diff line
		@@ -17,14 +17,21 @@
		package com.android.systemui.settings;

		import android.content.Context;
		import android.content.Intent;
		import android.util.AttributeSet;
		import android.view.MotionEvent;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.widget.SeekBar;

		import com.android.settingslib.RestrictedLockUtils;
		import com.android.systemui.Dependency;
		import com.android.systemui.plugins.ActivityStarter;

		public class ToggleSeekBar extends SeekBar {
		private String mAccessibilityLabel;

		private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin = null;

		public ToggleSeekBar(Context context) {
		super(context);
		}
		@@ -39,6 +46,12 @@ public class ToggleSeekBar extends SeekBar {

		@Override
		public boolean onTouchEvent(MotionEvent event) {
		if (mEnforcedAdmin != null) {
		Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(
		mContext, mEnforcedAdmin);
		Dependency.get(ActivityStarter.class).postStartActivityDismissingKeyguard(intent, 0);
		return true;
		}
		if (!isEnabled()) {
		setEnabled(true);
		}
		@@ -57,4 +70,8 @@ public class ToggleSeekBar extends SeekBar {
		info.setText(mAccessibilityLabel);
		}
		}

		public void setEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
		mEnforcedAdmin = admin;
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.widget.SeekBar;
		import android.widget.SeekBar.OnSeekBarChangeListener;
		import android.widget.TextView;

		import com.android.settingslib.RestrictedLockUtils;
		import com.android.systemui.R;
		import com.android.systemui.statusbar.policy.BrightnessMirrorController;

		@@ -95,6 +96,12 @@ public class ToggleSliderView extends RelativeLayout implements ToggleSlider {
		}
		}

		public void setEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
		mToggle.setEnabled(admin == null);
		mSlider.setEnabled(admin == null);
		mSlider.setEnforcedAdmin(admin);
		}

		public void setOnChangedListener(Listener l) {
		mListener = l;
		}