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

Commit b41253b7 authored by Matt Pietal's avatar Matt Pietal
Browse files

Update to latest UX margins for clock... and much more 

Remove old style clocks and all related code. Begin unraveling code
supporting multiple layouts. Migrate plugin small/big clock support to
the new clock areas.

Fixes: 184073275
Test: atest KeyguardClockSwitchTest KeyguardClockSwitchControllerTest
Change-Id: I38dc2a6df6a710c6da23cbb17fac8d28f3b84764
parent d7440a1c

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

+7 −42
Original line number Diff line number Diff line
@@ -25,55 +25,19 @@ 
    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal|top">

    <FrameLayout

         android:id="@+id/clock_view"

         android:layout_width="match_parent"

         android:layout_height="wrap_content"

         android:layout_gravity="center_horizontal"

         android:layout_alignParentTop="true">

        <TextClock

             android:id="@+id/default_clock_view"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:layout_gravity="center_horizontal"

             android:gravity="center_horizontal"

             android:paddingBottom="@dimen/title_clock_padding"

             android:letterSpacing="0.02"

             android:textColor="?attr/wallpaperTextColor"

             android:singleLine="true"

             style="@style/widget_big"

             android:format12Hour="@string/keyguard_widget_12_hours_format"

             android:format24Hour="@string/keyguard_widget_24_hours_format"

             android:elegantTextHeight="false"

        />

        <TextClock

             android:id="@+id/default_clock_view_bold"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:layout_gravity="bottom|center_horizontal"

             android:gravity="center_horizontal"

             android:textColor="?attr/wallpaperTextColor"

             android:singleLine="true"

             style="@style/widget_title_bold"

             android:format12Hour="@string/keyguard_widget_12_hours_format"

             android:format24Hour="@string/keyguard_widget_24_hours_format"

             android:elegantTextHeight="false"

             android:visibility="invisible"

             />

    </FrameLayout>

    <FrameLayout

        android:id="@+id/new_lockscreen_clock_view"

        android:id="@+id/lockscreen_clock_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:visibility="gone">

        android:paddingStart="@dimen/clock_padding_start">

        <com.android.keyguard.AnimatableClockView

            android:id="@+id/animatable_clock_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:gravity="center_horizontal"

            android:textSize="86dp"

            android:textSize="@dimen/clock_text_size"

            android:fontFamily="@font/clock"

            android:typeface="monospace"

            android:elegantTextHeight="false"
@@ -83,7 +47,7 @@ 
        />

    </FrameLayout>

    <FrameLayout

        android:id="@+id/new_lockscreen_clock_view_large"

        android:id="@+id/lockscreen_clock_view_large"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/keyguard_status_area"
@@ -106,7 +70,8 @@ 
        android:id="@+id/keyguard_status_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/clock_view" />

        android:layout_alignParentStart="true"

        android:layout_below="@id/lockscreen_clock_view" />



    <com.android.systemui.statusbar.phone.NotificationIconContainer

        android:id="@+id/left_aligned_notification_icon_container"
@@ -114,6 +79,6 @@ 
        android:layout_height="@dimen/notification_shelf_height"

        android:layout_marginTop="@dimen/widget_vertical_padding"

        android:layout_below="@id/keyguard_status_area"

        android:visibility="gone"

        android:paddingStart="@dimen/below_clock_padding_start"

    />

</com.android.keyguard.KeyguardClockSwitch>

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    android:layout_gravity="center_horizontal"

    android:clipToPadding="false"

    android:orientation="vertical"

    android:paddingStart="@dimen/below_clock_padding_start"

    android:layout_centerHorizontal="true">

    <TextView

              android:id="@+id/title"

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

+0 −7
Original line number Diff line number Diff line
@@ -70,12 +70,5 @@ 
            android:letterSpacing="0.05"

            android:ellipsize="marquee"

            android:singleLine="true" />

        <com.android.systemui.statusbar.phone.NotificationIconContainer

            android:id="@+id/clock_notification_icon_container"

            android:layout_width="match_parent"

            android:layout_height="@dimen/notification_shelf_height"

            android:layout_marginTop="@dimen/widget_vertical_padding"

            android:visibility="invisible"

        />

    </LinearLayout>

</com.android.keyguard.KeyguardStatusView>

packages/SystemUI/res-keyguard/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -90,4 +90,8 @@ 
    <dimen name="num_pad_key_width">72dp</dimen>

    <dimen name="num_pad_row_margin_bottom">6dp</dimen>

    <dimen name="num_pad_key_margin_end">12dp</dimen>



    <!-- additional offset for clock switch area items -->

    <dimen name="clock_padding_start">28dp</dimen>

    <dimen name="below_clock_padding_start">32dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -1086,8 +1086,9 @@ 
         burn-in on AOD. -->

    <dimen name="burn_in_prevention_offset_y_large_clock">42dp</dimen>



    <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->

    <!-- Clock maximum font size (dp is intentional, to prevent any further scaling) -->

    <dimen name="large_clock_text_size">150dp</dimen>

    <dimen name="clock_text_size">86dp</dimen>



    <!-- The maximum offset in either direction that icons move to prevent burn-in on AOD. -->

    <dimen name="default_burn_in_prevention_offset">15dp</dimen>