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

Commit a1e6b315 authored by Adrian Roos's avatar Adrian Roos
Browse files

AOD: Use DOZE_SUSPEND screenstate when supported 

Bug: 30876804
Bug: 33175018
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapterTest.java
Change-Id: If4d0cadced1f0ac3e737d78759820858b70081e6
parent e784f7a0

packages/SystemUI/res/values/config.xml

+4 −1
Original line number Diff line number Diff line
@@ -209,9 +209,12 @@ 
    <!-- Set to true to enable the user switcher on the keyguard. -->

    <bool name="config_keyguardUserSwitcher">false</bool>



    <!-- Doze: does this device support STATE_DOZE and STATE_DOZE_SUSPEND?  -->

    <!-- Doze: does this device support STATE_DOZE?  -->

    <bool name="doze_display_state_supported">false</bool>



    <!-- Doze: does this device support STATE_DOZE_SUSPEND?  -->

    <bool name="doze_suspend_display_state_supported">false</bool>



    <!-- Doze: should the significant motion sensor be used as a pulse signal? -->

    <bool name="doze_pulse_on_significant_motion">false</bool>

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ public class DozeFactory { 
        WakeLock wakeLock = WakeLock.createPartial(context, "Doze");



        DozeMachine machine = new DozeMachine(

                DozeScreenStatePreventingAdapter.wrapIfNeeded(dozeService, params),

                DozeSuspendScreenStatePreventingAdapter.wrapIfNeeded(

                        DozeScreenStatePreventingAdapter.wrapIfNeeded(dozeService, params), params),

                config,

                wakeLock);

        machine.setParts(new DozeMachine.Part[]{

packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java

+2 −1
Original line number Diff line number Diff line
@@ -87,8 +87,9 @@ public class DozeMachine { 
                case DOZE:

                    return Display.STATE_OFF;

                case DOZE_PULSING:

                    return Display.STATE_DOZE;

                case DOZE_AOD:

                    return Display.STATE_DOZE; // TODO: use STATE_ON if appropriate.

                    return Display.STATE_DOZE_SUSPEND;

                default:

                    return Display.STATE_UNKNOWN;

            }

packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java

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

 * 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.doze;



import android.support.annotation.VisibleForTesting;

import android.view.Display;



import com.android.systemui.statusbar.phone.DozeParameters;



/**

 * Prevents usage of doze screen states on devices that don't support them.

 */

public class DozeSuspendScreenStatePreventingAdapter implements DozeMachine.Service {



    private final DozeMachine.Service mInner;



    @VisibleForTesting

    DozeSuspendScreenStatePreventingAdapter(DozeMachine.Service inner) {

        mInner = inner;

    }



    @Override

    public void finish() {

        mInner.finish();

    }



    @Override

    public void setDozeScreenState(int state) {

        if (state == Display.STATE_DOZE_SUSPEND) {

            state = Display.STATE_DOZE;

        }

        mInner.setDozeScreenState(state);

    }



    @Override

    public void requestWakeUp() {

        mInner.requestWakeUp();

    }



    /**

     * If the device supports the doze display state, return {@code inner}. Otherwise

     * return a new instance of {@link DozeSuspendScreenStatePreventingAdapter} wrapping {@code inner}.

     */

    public static DozeMachine.Service wrapIfNeeded(DozeMachine.Service inner,

            DozeParameters params) {

        return isNeeded(params) ? new DozeSuspendScreenStatePreventingAdapter(inner) : inner;

    }



    private static boolean isNeeded(DozeParameters params) {

        return !params.getDozeSuspendDisplayStateSupported();

    }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ public class DozeParameters { 
        return getBoolean("doze.display.supported", R.bool.doze_display_state_supported);

    }



    public boolean getDozeSuspendDisplayStateSupported() {

        return mContext.getResources().getBoolean(R.bool.doze_suspend_display_state_supported);

    }



    public int getPulseDuration(boolean pickup) {

        return getPulseInDuration(pickup) + getPulseVisibleDuration() + getPulseOutDuration();

    }