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

Commit dfa86514 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33102000',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33102000', 'googleplex-android-review.googlesource.com/33173159'] into 25Q2-release.

Change-Id: I54a4d5c293e4577c4fa8d167f4ba388e7fc78e8d
parents 99b01a65 23ddc74d

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
        <item name="android:textColor">@color/status_bar_clock_color</item>

    </style>



    <!-- TODO(b/411157074): This style can be removed once the style for the status bar clock is solidified. -->

    <style name="TextAppearance.StatusBar.Default.Clock">

        <item name="android:fontFeatureSettings">tnum</item>

    </style>



    <style name="TextAppearance.StatusBar.UserChip" parent="@*android:style/TextAppearance.StatusBar.Icon">

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+2 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ public class Clock extends TextView implements 
                filter.addAction(Intent.ACTION_SCREEN_ON);

                mBroadcastDispatcher.registerReceiver(mScreenReceiver, filter);

            }

            setFontFeatureSettings("tnum");

        } else {

            if (mSecondsHandler != null) {

                mScreenReceiverRegistered = false;
@@ -416,6 +417,7 @@ public class Clock extends TextView implements 
                mSecondsHandler = null;

                updateClock();

            }

            setFontFeatureSettings(null);

        }

    }