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

Commit c97d88f9 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Always show battery percentage on AOD 

Fixes: 123362085
Test: visual
Change-Id: Ib94efbb9b84bad75ba0a485fff827acb397a8b5f
parent e1bb9986

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

+14 −5
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ public class KeyguardStatusBarView extends RelativeLayout 
     * Ratio representing being in ambient mode or not.

     */

    private float mDarkAmount;

    private boolean mDozing;



    public KeyguardStatusBarView(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -210,7 +211,7 @@ public class KeyguardStatusBarView extends RelativeLayout 
                mMultiUserSwitch.setVisibility(View.GONE);

            }

        }

        mBatteryView.setForceShowPercent(mBatteryCharging && mShowPercentAvailable);

        mBatteryView.setForceShowPercent(mBatteryCharging && mShowPercentAvailable || mDozing);

    }



    private void updateSystemIconsLayoutParams() {
@@ -347,7 +348,7 @@ public class KeyguardStatusBarView extends RelativeLayout 
        mIconManager = new TintedIconManager(findViewById(R.id.statusIcons));

        Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);

        onThemeChanged();

        updateDozeState();

        updateDarkState();

    }



    @Override
@@ -506,21 +507,29 @@ public class KeyguardStatusBarView extends RelativeLayout 
        }

    }



    public void setDozing(boolean dozing) {

        if (mDozing == dozing) {

            return;

        }

        mDozing = dozing;

        updateVisibilities();

    }



    public void setDarkAmount(float darkAmount) {

        mDarkAmount = darkAmount;

        if (darkAmount == 0) {

            dozeTimeTick();

        }

        updateDozeState();

        updateDarkState();

    }



    public void dozeTimeTick() {

        mCurrentBurnInOffsetX = getBurnInOffset(mBurnInOffset, true /* xAxis */);

        mCurrentBurnInOffsetY = getBurnInOffset(mBurnInOffset, false /* xAxis */);

        updateDozeState();

        updateDarkState();

    }



    private void updateDozeState() {

    private void updateDarkState() {

        float alpha = 1f - mDarkAmount;

        int visibility = alpha != 0f ? VISIBLE : INVISIBLE;

        mCarrierLabel.setAlpha(alpha * alpha);

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

+3 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ public class NotificationPanelView extends PanelView implements 


    private KeyguardAffordanceHelper mAffordanceHelper;

    private KeyguardUserSwitcher mKeyguardUserSwitcher;

    private KeyguardStatusBarView mKeyguardStatusBar;

    @VisibleForTesting

    protected KeyguardStatusBarView mKeyguardStatusBar;

    private ViewGroup mBigClockContainer;

    private QS mQs;

    private FrameLayout mQsFrame;
@@ -2792,6 +2793,7 @@ public class NotificationPanelView extends PanelView implements 
        if (mDozing) {

            mNotificationStackScroller.setShowDarkShelf(!hasCustomClock());

        }

        mKeyguardStatusBar.setDozing(mDozing);



        if (mBarState == StatusBarState.KEYGUARD

                || mBarState == StatusBarState.SHADE_LOCKED) {

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

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
    private NotificationStackScrollLayout mNotificationStackScrollLayout;

    @Mock

    private KeyguardStatusView mKeyguardStatusView;

    @Mock

    private KeyguardStatusBarView mKeyguardStatusBar;

    private NotificationPanelView mNotificationPanelView;



    @Before
@@ -93,6 +95,7 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
            super(NotificationPanelViewTest.this.mContext, null);

            mNotificationStackScroller = mNotificationStackScrollLayout;

            mKeyguardStatusView = NotificationPanelViewTest.this.mKeyguardStatusView;

            mKeyguardStatusBar = NotificationPanelViewTest.this.mKeyguardStatusBar;

        }

    }

}