Merge "Fix night mode availability" into nyc-dev (4a668837) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import android.os.AsyncTask;
		import android.os.Handler;
		import android.os.Looper;
		import android.service.quicksettings.TileService;
		import com.android.systemui.Prefs;
		import com.android.systemui.Prefs.Key;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSTile;
		import com.android.systemui.qs.QSTile.DrawableIcon;
		@@ -57,10 +55,8 @@ public class TileQueryHelper {
		}

		private void addSystemTiles(QSTileHost host) {
		boolean hasColorMod = Prefs.getBoolean(host.getContext(), Key.QS_NIGHT_ADDED, false)
		&& TunerService.isTunerEnabled(host.getContext());
		String possible = mContext.getString(R.string.quick_settings_tiles_default)
		+ ",hotspot,inversion,saver,work,cast" + (hasColorMod ? ",night" : "");
		+ ",hotspot,inversion,saver,work,cast,night";
		String[] possibleTiles = possible.split(",");
		final Handler qsHandler = new Handler(host.getLooper());
		final Handler mainHandler = new Handler(Looper.getMainLooper());

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.content.Intent;
		import android.provider.Settings;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.systemui.Prefs;
		import com.android.systemui.Prefs.Key;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSTile;
		import com.android.systemui.statusbar.policy.NightModeController;
		@@ -45,6 +47,12 @@ public class NightModeTile extends QSTile<QSTile.State> implements NightModeCont
		mNightModeController = host.getNightModeController();
		}

		@Override
		public boolean isAvailable() {
		return Prefs.getBoolean(mContext, Key.QS_NIGHT_ADDED, false)
		&& TunerService.isTunerEnabled(mContext);
		}

		@Override
		public void setListening(boolean listening) {
		if (listening) {