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

Commit e3800b2a authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Localize date and time formats on complications." into tm-qpr-dev am: a8454ad2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19051632



Change-Id: I1eb889cd7642fd8fabbb94515d8286e233999a66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98643ea5 a8454ad2

packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ 
    style="@style/clock_subtitle"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:format12Hour="EEE, MMM d"

    android:format24Hour="EEE, MMM d"/>
 
    android:format12Hour="@string/dream_date_complication_date_format"

    android:format24Hour="@string/dream_date_complication_date_format"/>

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    android:fontFamily="@font/clock"

    android:includeFontPadding="false"

    android:textColor="@android:color/white"

    android:format12Hour="h:mm"

    android:format24Hour="kk:mm"

    android:format12Hour="@string/dream_time_complication_12_hr_time_format"

    android:format24Hour="@string/dream_time_complication_24_hr_time_format"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:textSize="@dimen/dream_overlay_complication_clock_time_text_size"/>

packages/SystemUI/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -2581,4 +2581,12 @@ 
    <!-- [CHAR LIMIT=NONE] Le audio broadcast dialog, media app is unknown -->

    <string name="bt_le_audio_broadcast_dialog_unknown_name">Unknown</string>



    <!-- Date format for the Dream Date Complication [CHAR LIMIT=NONE] -->

    <string name="dream_date_complication_date_format">EEE, MMM d</string>



    <!-- Time format for the Dream Time Complication for 12-hour time format [CHAR LIMIT=NONE] -->

    <string name="dream_time_complication_12_hr_time_format">h:mm</string>



    <!-- Time format for the Dream Time Complication for 24-hour time format [CHAR LIMIT=NONE] -->

    <string name="dream_time_complication_24_hr_time_format">kk:mm</string>

</resources>