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

Commit 7907ff24 authored by Adrian Roos's avatar Adrian Roos
Browse files

AoD: Adjust clock layout 

Shows the clock without the date. Also stop
hiding the stack scroller in AoD.

Bug: 30876804
Test: manual
Change-Id: I5f2a8e39be7750493dd8dac83641ac0b96082d0e
parent 487374fd

packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java

+14 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.util.Log; 
import android.util.Slog;

import android.util.TypedValue;

import android.view.View;

import android.view.ViewGroup;

import android.widget.GridLayout;

import android.widget.TextClock;

import android.widget.TextView;
@@ -48,6 +49,7 @@ public class KeyguardStatusView extends GridLayout { 
    private TextClock mDateView;

    private TextClock mClockView;

    private TextView mOwnerInfo;

    private ViewGroup mClockContainer;



    private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {
@@ -105,6 +107,7 @@ public class KeyguardStatusView extends GridLayout { 
    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mClockContainer = (ViewGroup) findViewById(R.id.keyguard_clock_container);

        mAlarmStatusView = (TextView) findViewById(R.id.alarm_status);

        mDateView = (TextClock) findViewById(R.id.date_view);

        mClockView = (TextClock) findViewById(R.id.clock_view);
@@ -260,4 +263,15 @@ public class KeyguardStatusView extends GridLayout { 
            cacheKey = key;

        }

    }



    public void setDark(boolean dark) {

        final int N = mClockContainer.getChildCount();

        for (int i = 0; i < N; i++) {

            View child = mClockContainer.getChildAt(i);

            if (child == mClockView) {

                continue;

            }

            child.setAlpha(dark ? 0 : 1);

        }

    }

}

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

+9 −14
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.util.Log; 
import android.view.View;

import android.view.animation.Interpolator;



import com.android.keyguard.KeyguardStatusView;

import com.android.systemui.Interpolators;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.doze.DozeLog;
@@ -41,7 +42,9 @@ public class DozeScrimController { 
    private final Handler mHandler = new Handler();

    private final ScrimController mScrimController;



    private final Context mContext;

    private final View mStackScroller;

    private final KeyguardStatusView mKeyguardStatusView;



    private boolean mDozing;

    private DozeHost.PulseCallback mPulseCallback;
@@ -52,10 +55,12 @@ public class DozeScrimController { 
    private float mBehindTarget;



    public DozeScrimController(ScrimController scrimController, Context context,

            View stackScroller) {

            View stackScroller, KeyguardStatusView keyguardStatusView) {

        mContext = context;

        mStackScroller = stackScroller;

        mScrimController = scrimController;

        mDozeParameters = new DozeParameters(context);

        mKeyguardStatusView = keyguardStatusView;

    }



    public void setDozing(boolean dozing, boolean animate) {
@@ -65,10 +70,7 @@ public class DozeScrimController { 
            abortAnimations();

            mScrimController.setDozeBehindAlpha(1f);

            mScrimController.setDozeInFrontAlpha(mDozeParameters.getAlwaysOn() ? 0f : 1f);

            if (mDozeParameters.getAlwaysOn()) {

                mStackScroller.setAlpha(0f);

                mHandler.postDelayed(() -> mStackScroller.setAlpha(0f), 30);

            }

            mKeyguardStatusView.setDark(true);

        } else {

            cancelPulsing();

            if (animate) {
@@ -83,9 +85,8 @@ public class DozeScrimController { 
                mScrimController.setDozeBehindAlpha(0f);

                mScrimController.setDozeInFrontAlpha(0f);

            }

            if (mDozeParameters.getAlwaysOn()) {

                mStackScroller.setAlpha(1f);

            }

            // TODO: animate

            mKeyguardStatusView.setDark(false);

        }

    }
@@ -123,9 +124,6 @@ public class DozeScrimController { 
        if (isPulsing()) {

            final boolean pickupOrDoubleTap = mPulseReason == DozeLog.PULSE_REASON_SENSOR_PICKUP

                    || mPulseReason == DozeLog.PULSE_REASON_SENSOR_DOUBLE_TAP;

            if (mDozeParameters.getAlwaysOn()) {

                mStackScroller.setAlpha(1f);

            }

            startScrimAnimation(true /* inFront */, 0f,

                    mDozeParameters.getPulseInDuration(pickupOrDoubleTap),

                    pickupOrDoubleTap ? Interpolators.LINEAR_OUT_SLOW_IN : Interpolators.ALPHA_OUT,
@@ -291,9 +289,6 @@ public class DozeScrimController { 
        @Override

        public void run() {

            if (DEBUG) Log.d(TAG, "Pulse out finished");

            if (mDozeParameters.getAlwaysOn()) {

                mStackScroller.setAlpha(0f);

            }

            DozeLog.tracePulseFinish();



            // Signal that the pulse is all finished so we can turn the screen off now.

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

+2 −1
Original line number Diff line number Diff line
@@ -897,7 +897,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mHeadsUpManager.addListener(mScrimController);

        mStackScroller.setScrimController(mScrimController);

        mStatusBarView.setScrimController(mScrimController);

        mDozeScrimController = new DozeScrimController(mScrimController, context, mStackScroller);

        mDozeScrimController = new DozeScrimController(mScrimController, context, mStackScroller,

                mKeyguardStatusView);



        // Other icons

        mLocationController = new LocationControllerImpl(mContext,