diff options
7 files changed, 0 insertions, 108 deletions
diff --git a/packages/SystemUI/res/drawable/dream_aqi_badge_bg.xml b/packages/SystemUI/res/drawable/dream_aqi_badge_bg.xml deleted file mode 100644 index 1992c7733bd3..000000000000 --- a/packages/SystemUI/res/drawable/dream_aqi_badge_bg.xml +++ /dev/null @@ -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>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_aqi.xml b/packages/SystemUI/res/layout/dream_overlay_complication_aqi.xml deleted file mode 100644 index fcebb8d3f6c6..000000000000 --- a/packages/SystemUI/res/layout/dream_overlay_complication_aqi.xml +++ /dev/null @@ -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"/>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml deleted file mode 100644 index efbdd1af3644..000000000000 --- a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml +++ /dev/null @@ -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"/> diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml b/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml deleted file mode 100644 index f05922fb395c..000000000000 --- a/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml +++ /dev/null @@ -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" /> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index bc88bee41df8..ca4217f64b60 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -236,15 +236,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> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index f3d2638c4ee7..c10e75289cf2 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1560,10 +1560,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 --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 084a0e0cb62d..643f831c7f94 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2688,9 +2688,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> |