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

Merge "Fix night mode availability" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-03-03 23:41:40 +00:00
committed by Android (Google) Code Review
parent d27dafeade 1b0afebf37
commit 4a6688371f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
packages/SystemUI/src/com/android/systemui/tuner/NightModeTile.java
View File

@@ -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) {