Localize date and time formats on complications. This changelist moves the formats for date and time shown in the dream overlay to resources for proper localization. Test: manual Fixes: 235099086 Change-Id: If3f98207d4d913e08a9c3a677af80015fdebf541
diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml index 3f56baf..efbdd1a 100644 --- a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml +++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml
@@ -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"/>
diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml index e066d38..7a57293 100644 --- a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml +++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml
@@ -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"/>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index d88428f..343ec4f6 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml
@@ -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>