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

Commit 76d38e72 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Themeable keyguard clock 

Bug: 37014702
Test: change wallpaper to light/dark, look at the clock on the keyguard
Change-Id: I7e222401dfa0e3ac8be6635f45a4f517dd5509d9
parent 53d5062f

packages/SystemUI/res-keyguard/drawable/ic_access_alarms_big.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ Copyright (C) 2014 The Android Open Source Project 
    android:viewportHeight="24.0">



    <path

        android:fillColor="@color/clock_gray"

        android:fillColor="?attr/bgProtectSecondaryTextColor"

        android:pathData="M22.0,5.7l-4.6,-3.9l-1.3,1.5l4.6,3.9L22.0,5.7zM7.9,3.4L6.6,1.9L2.0,5.7l1.3,1.5L7.9,3.4zM12.5,8.0L11.0,8.0l0.0,6.0l4.7,2.9l0.8,-1.2l-4.0,-2.4L12.5,8.0zM12.0,4.0c-5.0,0.0 -9.0,4.0 -9.0,9.0c0.0,5.0 4.0,9.0 9.0,9.0s9.0,-4.0 9.0,-9.0C21.0,8.0 17.0,4.0 12.0,4.0zM12.0,20.0c-3.9,0.0 -7.0,-3.1 -7.0,-7.0c0.0,-3.9 3.1,-7.0 7.0,-7.0c3.9,0.0 7.0,3.1 7.0,7.0C19.0,16.9 15.9,20.0 12.0,20.0z"/>

</vector>

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal|top"

                android:textColor="@color/clock_white"

                android:textColor="?attr/bgProtectTextColor"

                android:singleLine="true"

                style="@style/widget_big_thin"

                android:format12Hour="@string/keyguard_widget_12_hours_format"

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

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    <TextClock android:id="@+id/date_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/clock_white"

        android:textColor="?attr/bgProtectTextColor"

        style="@style/widget_label"

        android:letterSpacing="0.15"

        android:gravity="center"
@@ -38,7 +38,7 @@ 
        android:layout_height="wrap_content"

        android:drawablePadding="6dp"

        android:drawableStart="@drawable/ic_access_alarms_big"

        android:textColor="@color/clock_gray"

        android:textColor="?attr/bgProtectSecondaryTextColor"

        android:letterSpacing="0.15"

        style="@style/widget_label"

        android:layout_marginStart="6dp"

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

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:layout_gravity="center_horizontal"

            android:layout_centerHorizontal="true"

            android:layout_alignParentTop="true"

            android:textColor="@color/clock_white"

            android:textColor="?attr/bgProtectTextColor"

            android:singleLine="true"

            style="@style/widget_big_thin"

            android:format12Hour="@string/keyguard_widget_12_hours_format"
@@ -73,7 +73,7 @@ 
            android:layout_marginTop="@dimen/date_owner_info_margin"

            android:layout_centerHorizontal="true"

            android:layout_below="@id/keyguard_status_area"

            android:textColor="@color/clock_gray"

            android:textColor="?attr/bgProtectSecondaryTextColor"

            android:textSize="@dimen/widget_label_font_size"

            android:letterSpacing="0.05"

            android:ellipsize="marquee"

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

+4 −4
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
     limitations under the License.

-->

<resources>



    <!-- Clock -->

    <color name="clock_white">#ffffffff</color>

    <color name="clock_gray">@*android:color/secondary_text_default_material_dark</color>

    <color name="keyguard_numpad_divider_light">#80FFFFFF</color> <!-- 50% white -->

    <color name="keyguard_numpad_divider_dark">#FF9FA4A6</color>

    <color name="keyguard_numpad_delete_light">#FFFFFFFF</color>

    <color name="keyguard_numpad_delete_dark">@color/material_grey_600</color>

</resources>