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

Commit 18ad43ab authored by Luca Stefani's avatar Luca Stefani
Browse files

SystemUI: Fix some issues with clock position 

* Hide/show clock only when requested
* Apply transition to center clock

Change-Id: I6c17c1c2025981e20b23ed6a7995a8dc8239126a
parent 12930acc

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

+0 −4
Original line number Diff line number Diff line
@@ -236,12 +236,10 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 


    public void hideSystemIconArea(boolean animate) {

        animateHide(mSystemIconArea, animate);

        animateHide(mClockController.getClockLayout(), animate);

    }



    public void showSystemIconArea(boolean animate) {

        animateShow(mSystemIconArea, animate);

        animateShow(mClockController.getClockLayout(), animate);

    }



    public void hideClock(boolean animate) {
@@ -265,12 +263,10 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 


    public void hideNotificationIconArea(boolean animate) {

        animateHide(mNotificationIconAreaInner, animate);

        animateHide(mClockController.getClockLayout(), animate);

    }



    public void showNotificationIconArea(boolean animate) {

        animateShow(mNotificationIconAreaInner, animate);

        animateShow(mClockController.getClockLayout(), animate);

    }



    public void hideOperatorName(boolean animate) {

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

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
    private final PhoneStatusBarView mView;

    private final float mIconAlphaWhenOpaque;



    private View mLeftSide, mStatusIcons, mBattery, mClock;

    private View mLeftSide, mStatusIcons, mBattery, mClockCenter;

    private Animator mCurrentAnimation;



    public PhoneStatusBarTransitions(PhoneStatusBarView view) {
@@ -44,6 +44,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 


    public void init() {

        mLeftSide = mView.findViewById(R.id.status_bar_left_side);

        mClockCenter = mView.findViewById(R.id.center_clock_layout);

        mStatusIcons = mView.findViewById(R.id.statusIcons);

        mBattery = mView.findViewById(R.id.battery);

        applyModeBackground(-1, getMode(), false /*animate*/);
@@ -88,7 +89,8 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
            anims.playTogether(

                    animateTransitionTo(mLeftSide, newAlpha),

                    animateTransitionTo(mStatusIcons, newAlpha),

                    animateTransitionTo(mBattery, newAlphaBC)

                    animateTransitionTo(mBattery, newAlphaBC),

                    animateTransitionTo(mClockCenter, newAlpha)

                    );

            if (isLightsOut(mode)) {

                anims.setDuration(LIGHTS_OUT_DURATION);
@@ -99,6 +101,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
            mLeftSide.setAlpha(newAlpha);

            mStatusIcons.setAlpha(newAlpha);

            mBattery.setAlpha(newAlphaBC);

            mClockCenter.setAlpha(newAlpha);

        }

    }

}
 
 No newline at end of file