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

Merge "Add QS tile for Night Display when first used"

Browse Source
This commit is contained in:
Christine Franks
2017-03-01 22:03:51 +00:00
committed by Android (Google) Code Review
parent f2f36e5f75 69c2d1d752
commit 70d89be807
5 changed files with 141 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/NightDisplayController.java
View File

@@ -18,13 +18,13 @@ package com.android.internal.app;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.app.ActivityManager;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
import android.provider.Settings.Secure;
import android.util.Slog;
@@ -81,7 +81,7 @@ public final class NightDisplayController {
private Callback mCallback;
public NightDisplayController(@NonNull Context context) {
this(context, UserHandle.myUserId());
this(context, ActivityManager.getCurrentUser());
}
public NightDisplayController(@NonNull Context context, int userId) {

4
packages/SystemUI/src/com/android/systemui/Dependency.java
View File

@@ -23,6 +23,7 @@ import android.os.Process;
import android.util.ArrayMap;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.NightDisplayController;
import com.android.internal.util.Preconditions;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.fragments.FragmentService;
@@ -180,6 +181,9 @@ public class Dependency extends SystemUI {
mProviders.put(BatteryController.class, () ->
new BatteryControllerImpl(mContext));
mProviders.put(NightDisplayController.class, () ->
new NightDisplayController(mContext));
mProviders.put(ManagedProfileController.class, () ->
new ManagedProfileControllerImpl(mContext));

2
packages/SystemUI/src/com/android/systemui/Prefs.java
View File

@@ -47,6 +47,7 @@ public final class Prefs {
Key.QS_DATA_SAVER_DIALOG_SHOWN,
Key.QS_INVERT_COLORS_ADDED,
Key.QS_WORK_ADDED,
Key.QS_NIGHTDISPLAY_ADDED,
})
public @interface Key {
@Deprecated
@@ -67,6 +68,7 @@ public final class Prefs {
String QS_DATA_SAVER_DIALOG_SHOWN = "QsDataSaverDialogShown";
String QS_INVERT_COLORS_ADDED = "QsInvertColorsAdded";
String QS_WORK_ADDED = "QsWorkAdded";
String QS_NIGHTDISPLAY_ADDED = "QsNightDisplayAdded";
}
public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) {

34
packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java
View File

@@ -19,6 +19,8 @@ import android.os.Handler;
import android.os.Looper;
import android.provider.Settings.Secure;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.NightDisplayController;
import com.android.systemui.Dependency;
import com.android.systemui.Prefs;
import com.android.systemui.Prefs.Key;
@@ -64,6 +66,11 @@ public class AutoTileManager {
if (!Prefs.getBoolean(context, Key.QS_WORK_ADDED, false)) {
Dependency.get(ManagedProfileController.class).addCallback(mProfileCallback);
}
if (!Prefs.getBoolean(context, Key.QS_NIGHTDISPLAY_ADDED, false)
&& NightDisplayController.isAvailable(mContext)) {
Dependency.get(NightDisplayController.class).setListener(mNightDisplayCallback);
}
}
public void destroy() {
@@ -71,6 +78,7 @@ public class AutoTileManager {
Dependency.get(HotspotController.class).removeCallback(mHotspotCallback);
Dependency.get(DataSaverController.class).removeCallback(mDataSaverListener);
Dependency.get(ManagedProfileController.class).removeCallback(mProfileCallback);
Dependency.get(NightDisplayController.class).setListener(null);
}
private final ManagedProfileController.Callback mProfileCallback =
@@ -115,4 +123,30 @@ public class AutoTileManager {
}
}
};
@VisibleForTesting
final NightDisplayController.Callback mNightDisplayCallback =
new NightDisplayController.Callback() {
@Override
public void onActivated(boolean activated) {
if (activated) {
addNightTile();
}
}
@Override
public void onAutoModeChanged(int autoMode) {
if (autoMode == NightDisplayController.AUTO_MODE_CUSTOM
|| autoMode == NightDisplayController.AUTO_MODE_TWILIGHT) {
addNightTile();
}
}
private void addNightTile() {
mHost.addTile("night");
Prefs.putBoolean(mContext, Key.QS_NIGHTDISPLAY_ADDED, true);
mHandler.post(() -> Dependency.get(NightDisplayController.class)
.setListener(null));
}
};
}

99
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java Normal file
View File

@@ -0,0 +1,99 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.systemui.statusbar.phone;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import com.android.internal.app.NightDisplayController;
import com.android.systemui.Prefs;
import com.android.systemui.Prefs.Key;
import com.android.systemui.SysUIRunner;
import com.android.systemui.SysuiTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@RunWith(SysUIRunner.class)
public class AutoTileManagerTest extends SysuiTestCase {
private QSTileHost mQsTileHost;
private AutoTileManager mAutoTileManager;
@Before
public void setUp() throws Exception {
Prefs.putBoolean(mContext, Key.QS_NIGHTDISPLAY_ADDED, false);
mQsTileHost = Mockito.mock(QSTileHost.class);
mAutoTileManager = new AutoTileManager(mContext, mQsTileHost);
}
@After
public void tearDown() throws Exception {
mAutoTileManager = null;
}
@Test
public void nightTileAdded_whenActivated() {
if (!NightDisplayController.isAvailable(mContext)) {
return;
}
mAutoTileManager.mNightDisplayCallback.onActivated(true);
verify(mQsTileHost).addTile("night");
}
@Test
public void nightTileNotAdded_whenDeactivated() {
if (!NightDisplayController.isAvailable(mContext)) {
return;
}
mAutoTileManager.mNightDisplayCallback.onActivated(false);
verify(mQsTileHost, never()).addTile("night");
}
@Test
public void nightTileAdded_whenNightModeTwilight() {
if (!NightDisplayController.isAvailable(mContext)) {
return;
}
mAutoTileManager.mNightDisplayCallback.onAutoModeChanged(
NightDisplayController.AUTO_MODE_TWILIGHT);
verify(mQsTileHost).addTile("night");
}
@Test
public void nightTileAdded_whenNightModeCustom() {
if (!NightDisplayController.isAvailable(mContext)) {
return;
}
mAutoTileManager.mNightDisplayCallback.onAutoModeChanged(
NightDisplayController.AUTO_MODE_CUSTOM);
verify(mQsTileHost).addTile("night");
}
@Test
public void nightTileNotAdded_whenNightModeDisabled() {
if (!NightDisplayController.isAvailable(mContext)) {
return;
}
mAutoTileManager.mNightDisplayCallback.onAutoModeChanged(
NightDisplayController.AUTO_MODE_DISABLED);
verify(mQsTileHost, never()).addTile("night");
}
}