Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea7d71b3 authored by Christine Franks's avatar Christine Franks
Browse files

Add ColorDisplayManager 

Add ColorDisplayManager class, and shift some functionality from
ColorDisplayController

Bug: 111215474
Test: atest FrameworksServicesTest:ColorDisplayServiceTest
Change-Id: Ic38a12e1e0b0619fdad42a89b7ac3e878c8128b2
parent 3d171b2a

core/java/android/hardware/display/ColorDisplayManager.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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 android.hardware.display;



import android.content.Context;



import com.android.internal.R;



/**

 * Manages the display's color transforms and modes.

 * @hide

 */

public final class ColorDisplayManager {



    /**

     * Returns {@code true} if Night Display is supported by the device.

     */

    public static boolean isNightDisplayAvailable(Context context) {

        return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable);

    }

}

core/java/com/android/internal/app/ColorDisplayController.java

+0 −7
Original line number Diff line number Diff line
@@ -559,13 +559,6 @@ public final class ColorDisplayController { 
        return mMetricsLogger;

    }



    /**

     * Returns {@code true} if Night display is supported by the device.

     */

    public static boolean isAvailable(Context context) {

        return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable);

    }



    /**

     * Callback invoked whenever the Night display settings are changed.

     */

packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java

+5 −4
Original line number Diff line number Diff line
@@ -21,19 +21,21 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ 
import android.annotation.Nullable;

import android.app.ActivityManager;

import android.content.Intent;

import android.hardware.display.ColorDisplayManager;

import android.metrics.LogMaker;

import android.provider.Settings;

import android.service.quicksettings.Tile;

import androidx.annotation.StringRes;

import android.text.TextUtils;

import android.util.Log;

import android.widget.Switch;



import androidx.annotation.StringRes;



import com.android.internal.app.ColorDisplayController;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.systemui.R;

import com.android.systemui.qs.QSHost;

import com.android.systemui.plugins.qs.QSTile.BooleanState;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.tileimpl.QSTileImpl;



import java.text.DateFormat;
@@ -53,7 +55,6 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> 
    private static final String PATTERN_HOUR_MINUTE = "h:mm a";

    private static final String PATTERN_HOUR_NINUTE_24 = "HH:mm";





    private ColorDisplayController mController;

    private boolean mIsListening;
@@ -64,7 +65,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> 


    @Override

    public boolean isAvailable() {

        return ColorDisplayController.isAvailable(mContext);

        return ColorDisplayManager.isNightDisplayAvailable(mContext);

    }



    @Override

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

+6 −2
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
package com.android.systemui.statusbar.phone;



import android.content.Context;

import android.hardware.display.ColorDisplayManager;

import android.os.Handler;

import android.provider.Settings.Secure;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.ColorDisplayController;

import com.android.systemui.Dependency;
@@ -80,7 +82,7 @@ public class AutoTileManager { 
            Dependency.get(ManagedProfileController.class).addCallback(mProfileCallback);

        }

        if (!mAutoTracker.isAdded(NIGHT)

            && ColorDisplayController.isAvailable(mContext)) {

                && ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            Dependency.get(ColorDisplayController.class).setListener(mColorDisplayCallback);

        }

    }
@@ -93,8 +95,10 @@ public class AutoTileManager { 
        Dependency.get(HotspotController.class).removeCallback(mHotspotCallback);

        Dependency.get(DataSaverController.class).removeCallback(mDataSaverListener);

        Dependency.get(ManagedProfileController.class).removeCallback(mProfileCallback);

        if (ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            Dependency.get(ColorDisplayController.class).setListener(null);

        }

    }



    public void unmarkTileAsAutoAdded(String tabSpec) {

        mAutoTracker.setTileRemoved(tabSpec);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java

+8 −8
Original line number Diff line number Diff line
@@ -19,22 +19,22 @@ package com.android.systemui.statusbar.phone; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.hardware.display.ColorDisplayManager;

import android.os.Handler;

import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;



import com.android.internal.app.ColorDisplayController;

import com.android.systemui.Dependency;

import com.android.systemui.Prefs;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.qs.AutoAddTracker;

import com.android.systemui.qs.QSTileHost;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;



@RunWith(AndroidTestingRunner.class)
@@ -56,7 +56,7 @@ public class AutoTileManagerTest extends SysuiTestCase { 


    @Test

    public void nightTileAdded_whenActivated() {

        if (!ColorDisplayController.isAvailable(mContext)) {

        if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            return;

        }

        mAutoTileManager.mColorDisplayCallback.onActivated(true);
@@ -65,7 +65,7 @@ public class AutoTileManagerTest extends SysuiTestCase { 


    @Test

    public void nightTileNotAdded_whenDeactivated() {

        if (!ColorDisplayController.isAvailable(mContext)) {

        if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            return;

        }

        mAutoTileManager.mColorDisplayCallback.onActivated(false);
@@ -74,7 +74,7 @@ public class AutoTileManagerTest extends SysuiTestCase { 


    @Test

    public void nightTileAdded_whenNightModeTwilight() {

        if (!ColorDisplayController.isAvailable(mContext)) {

        if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            return;

        }

        mAutoTileManager.mColorDisplayCallback.onAutoModeChanged(
@@ -84,7 +84,7 @@ public class AutoTileManagerTest extends SysuiTestCase { 


    @Test

    public void nightTileAdded_whenNightModeCustom() {

        if (!ColorDisplayController.isAvailable(mContext)) {

        if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            return;

        }

        mAutoTileManager.mColorDisplayCallback.onAutoModeChanged(
@@ -94,7 +94,7 @@ public class AutoTileManagerTest extends SysuiTestCase { 


    @Test

    public void nightTileNotAdded_whenNightModeDisabled() {

        if (!ColorDisplayController.isAvailable(mContext)) {

        if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            return;

        }

        mAutoTileManager.mColorDisplayCallback.onAutoModeChanged(