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

Commit cc603524 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Clean up resources for date, weather, and aqi complications." into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20723733



Change-Id: I298e72e0439e73531da7ab1a68d4e337952dae8b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75a1b8f1 7cc88696

packages/SystemUI/res/drawable/dream_aqi_badge_bg.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

  ~ 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

packages/SystemUI/res/layout/dream_overlay_complication_aqi.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<!--

  ~ 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

packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?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"/>

packages/SystemUI/res/layout/dream_overlay_complication_weather.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?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" />

packages/SystemUI/res/values/colors.xml

+0 −9
Original line number Diff line number Diff line
@@ -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>