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

Merge "Merge "Clean up resources for date, weather, and aqi complications." into tm-qpr-dev am: a668ed6134 am: 7cc8869659"

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-12-14 08:09:31 +00:00
committed by Android (Google) Code Review
parent 30d6c396dc cc603524a2
commit b78d7e4697
7 changed files with 0 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/res/drawable/dream_aqi_badge_bg.xml
View File

@@ -1,20 +0,0 @@
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/dream_overlay_aqi_unknown" />
<corners android:radius="@dimen/dream_aqi_badge_corner_radius" />
</shape>

26
packages/SystemUI/res/layout/dream_overlay_complication_aqi.xml
View File

@@ -1,26 +0,0 @@
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/aqi_view"
style="@style/clock_subtitle"
android:visibility="gone"
android:background="@drawable/dream_aqi_badge_bg"
android:paddingHorizontal="@dimen/dream_aqi_badge_padding_horizontal"
android:paddingVertical="@dimen/dream_aqi_badge_padding_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

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

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<TextClock
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/date_view"
style="@style/clock_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:format12Hour="@string/dream_date_complication_date_format"
android:format24Hour="@string/dream_date_complication_date_format"/>

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

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/weather_view"
style="@style/clock_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

9
packages/SystemUI/res/values/colors.xml
View File

@@ -246,15 +246,6 @@
<color name="dream_overlay_camera_mic_off_dot_color">#FCBE03</color>
<!-- Air Quality -->
<color name="dream_overlay_aqi_good">#689F38</color>
<color name="dream_overlay_aqi_moderate">#FBC02D</color>
<color name="dream_overlay_aqi_unhealthy_sensitive">#F57C00</color>
<color name="dream_overlay_aqi_unhealthy">#C53929</color>
<color name="dream_overlay_aqi_very_unhealthy">#AD1457</color>
<color name="dream_overlay_aqi_hazardous">#880E4F</color>
<color name="dream_overlay_aqi_unknown">#BDC1C6</color>
<!-- Dream overlay text shadows -->
<color name="dream_overlay_clock_key_text_shadow_color">#4D000000</color>
<color name="dream_overlay_clock_ambient_text_shadow_color">#4D000000</color>

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

@@ -1583,10 +1583,6 @@
<dimen name="dream_overlay_y_offset">80dp</dimen>
<dimen name="dream_overlay_exit_y_offset">40dp</dimen>
<dimen name="dream_aqi_badge_corner_radius">28dp</dimen>
<dimen name="dream_aqi_badge_padding_vertical">6dp</dimen>
<dimen name="dream_aqi_badge_padding_horizontal">16dp</dimen>
<dimen name="status_view_margin_horizontal">0dp</dimen>
<!-- Media output broadcast dialog QR code picture size -->

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

@@ -2792,9 +2792,6 @@
<!-- [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>