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

Commit a8454ad2 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

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

parents 2a8b3b47 d29eb1cd
Loading
Loading
Loading
Loading
+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"/>
+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"/>
+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>