From a51dd978ee6e6a9a751a85914d8dd617d93ca117 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Mon, 3 May 2021 08:59:34 +0000
Subject: [PATCH] Revert "Refine battery help message layout"

This reverts commit 2369167d63ee8a1bcd43aa16c3d316d2ada33bbc.

Reason for revert: break Settings checking style

Bug: 187023021
Change-Id: I4bb0f93e5d2a545af5e6004dfe24c7e87738036c
---
 res/layout/preference_battery_error.xml | 42 ++++++++++++-------------
 res/values/colors.xml                   |  1 -
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/res/layout/preference_battery_error.xml b/res/layout/preference_battery_error.xml
index 4efd13af012..66ff96a71f2 100644
--- a/res/layout/preference_battery_error.xml
+++ b/res/layout/preference_battery_error.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2021 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.
+  ~ Copyright (C) 2021 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.
   -->
-
+<!-- TODO(b/179237551): Refine the layout once the design been lock down. -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -23,28 +23,26 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
         style="@style/ContextualCardStyle">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="top|start"
             android:orientation="vertical"
-            android:padding="20dp"
-            android:background="@color/battery_info_error_color_red">
+            android:padding="16dp"
+            android:background="@color/homepage_emergency_background">
 
             <ImageView
                 android:id="@+id/battery_icon"
-                android:src="@drawable/ic_warning_24dp"
-                android:tint="@*android:color/material_red_A700"
+                android:src="@drawable/ic_battery_alert_24dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
             <TextView android:id="@+id/summary_text"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_marginTop="12dp"
-                      android:layout_marginBottom="16dp"
                       android:text="@string/battery_missing_message"
                       android:textAppearance="?android:attr/textAppearanceSmall"
                       android:textColor="?android:attr/textColorSecondary" />
@@ -55,7 +53,7 @@
                       android:layout_gravity="end"
                       android:text="@string/battery_missing_link_message"
                       android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="@*android:color/material_red_A700" />
+                      android:textColor="?android:attr/colorError" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fc79f25e770..0aa309f92a3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -117,7 +117,6 @@
     <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_bad_color_dark">#f44336</color> <!-- Material Red 500 -->
-    <color name="battery_info_error_color_red">#fce8e6</color> <!-- Material Red 50 -->
 
     <!-- TODO: Figure out colors -->
     <color name="face_anim_particle_color_1">#ff00bcd4</color> <!-- Material Cyan 500 -->