From 797d2e126a38cf164a1b6cdb435d50ae230630d9 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 3 Aug 2017 16:16:18 -0700
Subject: [PATCH] Clean up styles and delete unused layout for action buttons

Change-Id: I65725b4ea04087b582a08497fd838d14e834b47a
Fixes: 63991885
Test: robotest and visual
---
 res/layout/app_action_buttons.xml           | 44 ---------------------
 res/layout/instant_app_buttons.xml          |  2 +-
 res/layout/manage_data_plans_preference.xml |  2 +-
 res/layout/two_action_buttons.xml           |  4 +-
 res/values/styles.xml                       |  2 +-
 5 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 res/layout/app_action_buttons.xml

diff --git a/res/layout/app_action_buttons.xml b/res/layout/app_action_buttons.xml
deleted file mode 100644
index e12fa23e8f6..00000000000
--- a/res/layout/app_action_buttons.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2016 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingTop="8dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
-    android:orientation="horizontal">
-
-    <Button
-        android:id="@+id/left_button"
-        style="@style/AppActionPrimaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp" />
-
-    <Button
-        android:id="@+id/right_button"
-        style="@style/AppActionPrimaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/instant_app_buttons.xml b/res/layout/instant_app_buttons.xml
index b267361f5bc..9c2e9156bc7 100644
--- a/res/layout/instant_app_buttons.xml
+++ b/res/layout/instant_app_buttons.xml
@@ -26,7 +26,7 @@
     android:visibility="gone">
     <Button
         android:id="@+id/install"
-        style="@style/AppActionPrimaryButton"
+        style="@style/ActionPrimaryButton"
         android:enabled="false"
         android:layout_width="0dp"
         android:layout_weight="1"
diff --git a/res/layout/manage_data_plans_preference.xml b/res/layout/manage_data_plans_preference.xml
index 1686d3fe64a..0db5698e7cd 100644
--- a/res/layout/manage_data_plans_preference.xml
+++ b/res/layout/manage_data_plans_preference.xml
@@ -28,5 +28,5 @@
             android:layout_height="wrap_content"
             android:text="@string/data_plan_usage_manage_plans_button_text"
             android:textAllCaps="true"
-            style="@style/AppActionPrimaryButton" />
+            style="@style/ActionPrimaryButton" />
 </FrameLayout>
diff --git a/res/layout/two_action_buttons.xml b/res/layout/two_action_buttons.xml
index af759c69e1a..41bcfc36efd 100644
--- a/res/layout/two_action_buttons.xml
+++ b/res/layout/two_action_buttons.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content">
         <Button
             android:id="@+id/button1_positive"
-            style="@style/AppActionPrimaryButton"
+            style="@style/ActionPrimaryButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp" />
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content">
         <Button
             android:id="@+id/button2_positive"
-            style="@style/AppActionPrimaryButton"
+            style="@style/ActionPrimaryButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 74b85b6d047..a3bfcdf5fff 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -421,7 +421,7 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
+    <style name="ActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
 
     <style name="ActionSecondaryButton" parent="android:Widget.Material.Button"/>