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

Commit 31e0ae0c authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Make date consistent with spec when alarm is set" into lmp-dev

parents 6d388af8 38a7c658

packages/Keyguard/res/values/donottranslate.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <string name="abbrev_wday_month_day_no_year">EEEEMMMMd</string>



    <!-- Skeleton string format for displaying the date when an alarm is set. -->

    <string name="abbrev_wday_month_day_no_year_alarm">EEEMMMMd</string>

    <string name="abbrev_wday_month_day_no_year_alarm">EEEMMMd</string>



    <!-- Skeleton string format for displaying the time in 12-hour format. -->

    <string name="clock_12hr_format">hm</string>

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

            android:layout_below="@id/clock"

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm"

            />



        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date_expanded"