PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Refine battery help message layout"" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-03 10:07:11 +00:00
committed by Android (Google) Code Review
parent b4a9916adf a51dd978ee
commit c3dc96ebc3
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
res/layout/preference_battery_error.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright (C) 2021 The Android Open Source Project ~ Copyright (C) 2021 The Android Open Source Project
~
Licensed under the Apache License, Version 2.0 (the "License"); ~ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. ~ you may not use this file except in compliance with the License.
You may obtain a copy of the License at ~ You may obtain a copy of the License at
~
http://www.apache.org/licenses/LICENSE-2.0 ~ http://www.apache.org/licenses/LICENSE-2.0
~
Unless required by applicable law or agreed to in writing, software ~ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, ~ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
limitations under the License. ~ limitations under the License.
--> -->
<!-- TODO(b/179237551): Refine the layout once the design been lock down. -->
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -23,28 +23,26 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
style="@style/ContextualCardStyle"> style="@style/ContextualCardStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="top|start" android:gravity="top|start"
android:orientation="vertical" android:orientation="vertical"
android:padding="20dp" android:padding="16dp"
android:background="@color/battery_info_error_color_red"> android:background="@color/homepage_emergency_background">
<ImageView <ImageView
android:id="@+id/battery_icon" android:id="@+id/battery_icon"
android:src="@drawable/ic_warning_24dp" android:src="@drawable/ic_battery_alert_24dp"
android:tint="@*android:color/material_red_A700"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView android:id="@+id/summary_text" <TextView android:id="@+id/summary_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginBottom="16dp"
android:text="@string/battery_missing_message" android:text="@string/battery_missing_message"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
@@ -55,7 +53,7 @@
android:layout_gravity="end" android:layout_gravity="end"
android:text="@string/battery_missing_link_message" android:text="@string/battery_missing_link_message"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@*android:color/material_red_A700" /> android:textColor="?android:attr/colorError" />
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
</FrameLayout> </FrameLayout>

1
res/values/colors.xml
View File

@@ -117,7 +117,6 @@
<color name="battery_good_color_dark">#4caf50</color> <!-- Material Green 500 --> <color name="battery_good_color_dark">#4caf50</color> <!-- Material Green 500 -->
<color name="battery_maybe_color_dark">#fdd835</color> <!-- Material Yellow 600 --> <color name="battery_maybe_color_dark">#fdd835</color> <!-- Material Yellow 600 -->
<color name="battery_bad_color_dark">#f44336</color> <!-- Material Red 500 --> <color name="battery_bad_color_dark">#f44336</color> <!-- Material Red 500 -->
<color name="battery_info_error_color_red">#fce8e6</color> <!-- Material Red 50 -->
<!-- TODO: Figure out colors --> <!-- TODO: Figure out colors -->
<color name="face_anim_particle_color_1">#ff00bcd4</color> <!-- Material Cyan 500 --> <color name="face_anim_particle_color_1">#ff00bcd4</color> <!-- Material Cyan 500 -->