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

Commit a9b3b6e9 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Set Visibility on ClockSwitch Animation" into udc-qpr-dev am: 09d1ccc0 am: 9b0c06f7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23272324



Change-Id: I3802f7534bce52f298af4ace79b3faf7abffc000
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0aa2a05 9b0c06f7

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+11 −3
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ public class KeyguardClockSwitch extends RelativeLayout { 


        if (!animate) {

            out.setAlpha(0f);

            out.setVisibility(INVISIBLE);

            in.setAlpha(1f);

            in.setVisibility(VISIBLE);

            mStatusArea.setTranslationY(statusAreaYTranslation);
@@ -255,8 +256,11 @@ public class KeyguardClockSwitch extends RelativeLayout { 
                        direction * -mClockSwitchYAmount));

        mClockOutAnim.addListener(new AnimatorListenerAdapter() {

            public void onAnimationEnd(Animator animation) {

                if (mClockOutAnim == animation) {

                    out.setVisibility(INVISIBLE);

                    mClockOutAnim = null;

                }

            }

        });



        in.setAlpha(0);
@@ -269,8 +273,10 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        mClockInAnim.setStartDelay(CLOCK_IN_START_DELAY_MILLIS);

        mClockInAnim.addListener(new AnimatorListenerAdapter() {

            public void onAnimationEnd(Animator animation) {

                if (mClockInAnim == animation) {

                    mClockInAnim = null;

                }

            }

        });



        mClockInAnim.start();
@@ -283,8 +289,10 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        mStatusAreaAnim.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

        mStatusAreaAnim.addListener(new AnimatorListenerAdapter() {

            public void onAnimationEnd(Animator animation) {

                if (mStatusAreaAnim == animation) {

                    mStatusAreaAnim = null;

                }

            }

        });

        mStatusAreaAnim.start();

    }

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+0 −8
Original line number Diff line number Diff line
@@ -425,10 +425,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            int clockHeight = clock.getLargeClock().getView().getHeight();

            return frameHeight / 2 + clockHeight / 2 + mKeyguardLargeClockTopMargin / -2;

        } else {

            // This is only called if we've never shown the large clock as the frame is inflated

            // with 'gone', but then the visibility is never set when it is animated away by

            // KeyguardClockSwitch, instead it is removed from the view hierarchy.

            // TODO(b/261755021): Cleanup Large Frame Visibility

            int clockHeight = clock.getSmallClock().getView().getHeight();

            return clockHeight + statusBarHeaderHeight + mKeyguardSmallClockTopMargin;

        }
@@ -446,15 +442,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        if (mLargeClockFrame.getVisibility() == View.VISIBLE) {

            return clock.getLargeClock().getView().getHeight();

        } else {

            // Is not called except in certain edge cases, see comment in getClockBottom

            // TODO(b/261755021): Cleanup Large Frame Visibility

            return clock.getSmallClock().getView().getHeight();

        }

    }



    boolean isClockTopAligned() {

        // Returns false except certain edge cases, see comment in getClockBottom

        // TODO(b/261755021): Cleanup Large Frame Visibility

        return mLargeClockFrame.getVisibility() != View.VISIBLE;

    }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.keyguard;



import static android.view.View.INVISIBLE;

import static android.view.View.VISIBLE;



import static com.android.keyguard.KeyguardClockSwitch.LARGE;
@@ -189,6 +190,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { 
        assertThat(mLargeClockFrame.getAlpha()).isEqualTo(1);

        assertThat(mLargeClockFrame.getVisibility()).isEqualTo(VISIBLE);

        assertThat(mSmallClockFrame.getAlpha()).isEqualTo(0);

        assertThat(mSmallClockFrame.getVisibility()).isEqualTo(INVISIBLE);

    }



    @Test
@@ -198,6 +200,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { 
        assertThat(mLargeClockFrame.getAlpha()).isEqualTo(1);

        assertThat(mLargeClockFrame.getVisibility()).isEqualTo(VISIBLE);

        assertThat(mSmallClockFrame.getAlpha()).isEqualTo(0);

        assertThat(mSmallClockFrame.getVisibility()).isEqualTo(INVISIBLE);

    }



    @Test
@@ -212,6 +215,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { 
        // only big clock is removed at switch

        assertThat(mLargeClockFrame.getParent()).isNull();

        assertThat(mLargeClockFrame.getAlpha()).isEqualTo(0);

        assertThat(mLargeClockFrame.getVisibility()).isEqualTo(INVISIBLE);

    }



    @Test
@@ -223,6 +227,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { 
        // only big clock is removed at switch

        assertThat(mLargeClockFrame.getParent()).isNull();

        assertThat(mLargeClockFrame.getAlpha()).isEqualTo(0);

        assertThat(mLargeClockFrame.getVisibility()).isEqualTo(INVISIBLE);

    }



    @Test