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

Commit 7b3724dd authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 3298264: Update LockScreen DigitalClock with new font"

parents 057898a9 d0fd0070

core/res/res/layout-xlarge/keyguard_screen_status_land.xml

+3 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
            android:ellipsize="none"

            android:textSize="120sp"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="#999999"

            android:textColor="@color/lockscreen_clock_background"

            android:layout_marginBottom="6dip"

            />
@@ -71,7 +71,7 @@ 
            android:ellipsize="none"

            android:textSize="120sp"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="#666666"

            android:textColor="@color/lockscreen_clock_foreground"

            android:layout_alignLeft="@id/timeDisplayBackground"

            android:layout_alignTop="@id/timeDisplayBackground"

            android:layout_marginBottom="6dip"
@@ -87,6 +87,7 @@ 
            android:textSize="30sp"

            android:layout_marginLeft="8dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_am_pm"

            />



    </com.android.internal.widget.DigitalClock>

core/res/res/layout-xlarge/keyguard_screen_status_port.xml

+3 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
            android:ellipsize="none"

            android:textSize="120sp"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="#999999"

            android:textColor="@color/lockscreen_clock_background"

            android:layout_marginBottom="6dip"

            />
@@ -70,7 +70,7 @@ 
            android:ellipsize="none"

            android:textSize="120sp"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="#666666"

            android:textColor="@color/lockscreen_clock_foreground"

            android:layout_marginBottom="6dip"

            android:layout_alignLeft="@id/timeDisplayBackground"

            android:layout_alignTop="@id/timeDisplayBackground"
@@ -86,6 +86,7 @@ 
            android:textSize="30sp"

            android:layout_marginLeft="8dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_am_pm"

            />



    </com.android.internal.widget.DigitalClock>

core/res/res/layout/keyguard_screen_tab_unlock.xml

+3 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
            android:textSize="72sp"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:layout_marginBottom="6dip"

            android:textColor="#999999"

            android:textColor="@color/lockscreen_clock_background"

            />



        <TextView android:id="@+id/timeDisplayForeground"
@@ -88,7 +88,7 @@ 
            android:textSize="72sp"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:layout_marginBottom="6dip"

            android:textColor="#666666"

            android:textColor="@color/lockscreen_clock_foreground"

            android:layout_alignLeft="@id/timeDisplayBackground"

            android:layout_alignTop="@id/timeDisplayBackground"

            />
@@ -103,6 +103,7 @@ 
            android:textSize="22sp"

            android:layout_marginLeft="8dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_am_pm"

            />



    </com.android.internal.widget.DigitalClock>

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+3 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
                android:textSize="72sp"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:layout_marginBottom="6dip"

                android:textColor="#999999"

                android:textColor="@color/lockscreen_clock_background"

                />



            <TextView android:id="@+id/timeDisplayForeground"
@@ -89,7 +89,7 @@ 
                android:textSize="72sp"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:layout_marginBottom="6dip"

                android:textColor="#666666"

                android:textColor="@color/lockscreen_clock_foreground"

                android:layout_alignLeft="@id/timeDisplayBackground"

                android:layout_alignTop="@id/timeDisplayBackground"

                />
@@ -104,6 +104,7 @@ 
                android:textSize="22sp"

                android:layout_marginLeft="8dip"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textColor="@color/lockscreen_clock_am_pm"

                />



        </com.android.internal.widget.DigitalClock>

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+3 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
                android:textSize="72sp"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:layout_marginBottom="6dip"

                android:textColor="#999999"

                android:textColor="@color/lockscreen_clock_background"

                />



            <TextView android:id="@+id/timeDisplayForeground"
@@ -91,7 +91,7 @@ 
                android:layout_marginBottom="6dip"

                android:layout_alignLeft="@id/timeDisplayBackground"

                android:layout_alignTop="@id/timeDisplayBackground"

                android:textColor="#666666"

                android:textColor="@color/lockscreen_clock_foreground"

                />
@@ -106,6 +106,7 @@ 
                android:textSize="22sp"

                android:layout_marginLeft="8dip"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textColor="@color/lockscreen_clock_am_pm"

                />



        </com.android.internal.widget.DigitalClock>