Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor common dream complication attributes in style." into tm-dev

Browse Source
This commit is contained in:
Nick Ning
2022-03-31 14:55:34 +00:00
committed by Android (Google) Code Review
parent 9628692e6c 7d8a0337d3
commit 42079ccc3f
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml
View File

@@ -17,13 +17,8 @@
<TextClock <TextClock
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/date_view" android:id="@+id/date_view"
style="@style/clock_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/dream_overlay_complication_shadow_padding"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
android:shadowColor="@color/keyguard_shadow_color"
android:shadowRadius="?attr/shadowRadius"
android:format12Hour="EEE, MMM d" android:format12Hour="EEE, MMM d"
android:format24Hour="EEE, MMM d" android:format24Hour="EEE, MMM d"/>
android:textSize="@dimen/dream_overlay_complication_clock_date_text_size"/>

8
packages/SystemUI/res/layout/dream_overlay_complication_weather.xml
View File

@@ -17,10 +17,6 @@
<TextView <TextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/weather_view" android:id="@+id/weather_view"
style="@style/clock_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:paddingHorizontal="@dimen/dream_overlay_complication_shadow_padding"
android:textColor="@android:color/white"
android:shadowColor="@color/keyguard_shadow_color"
android:shadowRadius="?attr/shadowRadius"
android:textSize="@dimen/dream_overlay_complication_weather_text_size"/>

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -1382,8 +1382,7 @@
<!-- Dream overlay complications related dimensions --> <!-- Dream overlay complications related dimensions -->
<dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen> <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen>
<dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen> <dimen name="dream_overlay_complication_clock_subtitle_text_size">18sp</dimen>
<dimen name="dream_overlay_complication_weather_text_size">18sp</dimen>
<dimen name="dream_overlay_complication_preview_text_size">36sp</dimen> <dimen name="dream_overlay_complication_preview_text_size">36sp</dimen>
<dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen> <dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen>
<dimen name="dream_overlay_complication_shadow_padding">2dp</dimen> <dimen name="dream_overlay_complication_shadow_padding">2dp</dimen>

14
packages/SystemUI/res/values/styles.xml
View File

@@ -1133,4 +1133,18 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
<!-- Dream Overlay Complication UI styles -->
<style name="clock_subtitle">
<item name="android:textSize">@dimen/dream_overlay_complication_clock_subtitle_text_size
</item>
<item name="android:paddingHorizontal">@dimen/dream_overlay_complication_shadow_padding
</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:ellipsize">none</item>
<item name="android:shadowColor">@color/keyguard_shadow_color</item>
<item name="android:shadowRadius">?attr/shadowRadius</item>
</style>
</resources> </resources>