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

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

Merge "Adjust WeatherDate view to be INVISIBLE instead of GONE" into udc-dev am: 424b9987 

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



Change-Id: Iea56432db2ace5922f3862a9c74283d93406d2ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20cf509e 424b9987

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

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        if (mDateWeatherView != null) {

            mUiExecutor.execute(() -> {

                mDateWeatherView.setVisibility(

                        clockHasCustomWeatherDataDisplay() ? View.GONE : View.VISIBLE);

                        clockHasCustomWeatherDataDisplay() ? View.INVISIBLE : View.VISIBLE);

            });

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { 
        listenerArgumentCaptor.getValue().onCurrentClockChanged();



        mExecutor.runAllReady();

        assertEquals(View.GONE, mFakeDateView.getVisibility());

        assertEquals(View.INVISIBLE, mFakeDateView.getVisibility());

    }



    @Test