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

Commit 54e353a0 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Keep clock below other UI elements 

Test: atest KeyguardClockSwitchTest
Test: manual
Bug: 229771520
Change-Id: I224217e4b32dd96f21a0445411d0b2ac07c157ea
parent f5283b48

packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    systemui:layout_constraintEnd_toEndOf="parent"

    systemui:layout_constraintTop_toTopOf="parent"

    android:layout_marginHorizontal="@dimen/status_view_margin_horizontal"

    android:clipChildren="false"

    android:layout_width="0dp"

    android:layout_height="wrap_content">

    <LinearLayout

packages/SystemUI/res/layout/status_bar_expanded.xml

+33 −33
Original line number Diff line number Diff line
@@ -32,41 +32,8 @@ 
        android:layout_height="match_parent"

        android:layout_width="match_parent" />



    <include

        layout="@layout/keyguard_bottom_area"

        android:visibility="gone" />



    <ViewStub

        android:id="@+id/keyguard_user_switcher_stub"

        android:layout="@layout/keyguard_user_switcher"

        android:layout_height="match_parent"

        android:layout_width="match_parent" />



    <include layout="@layout/status_bar_expanded_plugin_frame"/>



    <include layout="@layout/dock_info_bottom_area_overlay" />



    <com.android.keyguard.LockIconView

        android:id="@+id/lock_icon_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content">

        <!-- Background protection -->

        <ImageView

            android:id="@+id/lock_icon_bg"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/fingerprint_bg"

            android:visibility="invisible"/>



        <ImageView

            android:id="@+id/lock_icon"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:scaleType="centerCrop"/>



    </com.android.keyguard.LockIconView>



    <com.android.systemui.shade.NotificationsQuickSettingsContainer

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -145,6 +112,39 @@ 
        />

    </com.android.systemui.shade.NotificationsQuickSettingsContainer>



    <include

        layout="@layout/keyguard_bottom_area"

        android:visibility="gone" />



    <ViewStub

        android:id="@+id/keyguard_user_switcher_stub"

        android:layout="@layout/keyguard_user_switcher"

        android:layout_height="match_parent"

        android:layout_width="match_parent" />



    <include layout="@layout/dock_info_bottom_area_overlay" />



    <com.android.keyguard.LockIconView

        android:id="@+id/lock_icon_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content">

        <!-- Background protection -->

        <ImageView

            android:id="@+id/lock_icon_bg"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/fingerprint_bg"

            android:visibility="invisible"/>



        <ImageView

            android:id="@+id/lock_icon"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:scaleType="centerCrop"/>



    </com.android.keyguard.LockIconView>



    <FrameLayout

        android:id="@+id/preview_container"

        android:layout_width="match_parent"

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        if (useLargeClock) {

            out = mSmallClockFrame;

            in = mLargeClockFrame;

            if (indexOfChild(in) == -1) addView(in);

            if (indexOfChild(in) == -1) addView(in, 0);

            direction = -1;

            statusAreaYTranslation = mSmallClockFrame.getTop() - mStatusArea.getTop()

                    + mSmartspaceTopOffset;