From 80d1ec7deea2f4719f0cb1a6da053f52f007004c Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Sat, 29 Oct 2016 15:20:26 -0700
Subject: [PATCH] Tweak UI for action buttons under app header.

- Make a transparent button with border style

Bug: 1584976
Test: manual
Change-Id: Ide53d71963afd4587834357999b40df81bb93500
---
 res/drawable/button_bg_transparent.xml        | 38 +++++++++++++++++++
 res/values/styles.xml                         |  4 +-
 .../applications/AppHeaderController.java     |  3 +-
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 res/drawable/button_bg_transparent.xml

diff --git a/res/drawable/button_bg_transparent.xml b/res/drawable/button_bg_transparent.xml
new file mode 100644
index 00000000000..d9c6fc88ba9
--- /dev/null
+++ b/res/drawable/button_bg_transparent.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="4dp"
+       android:insetTop="6dp"
+       android:insetRight="4dp"
+       android:insetBottom="6dp">
+    <ripple android:color="?android:attr/colorControlHighlight">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <corners android:radius="2dp"/>
+                <solid android:color="@android:color/white"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="#00ffffff"/>
+                <!--make button border solid color, nontransparent-->
+                <stroke android:color="?android:attr/colorAccent" android:width="1dp"/>
+                <corners android:radius="2dp"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cabd02fba82..a18fde3f5e2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -467,7 +467,9 @@
         <item name="android:textSize">24sp</item>
     </style>
 
-    <style name="AppHeaderLinkButton" parent="android:Widget.Material.Button.Borderless"/>
+    <style name="AppHeaderLinkButton" parent="android:Widget.Material.Button.Borderless">
+        <item name="android:background">@drawable/button_bg_transparent</item>
+    </style>
 
     <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
 
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
index 40921b8f5ec..a6321df2365 100644
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ b/src/com/android/settings/applications/AppHeaderController.java
@@ -27,7 +27,6 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.support.annotation.IntDef;
-import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -35,7 +34,6 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -59,6 +57,7 @@ public class AppHeaderController {
         int ACTION_APP_PREFERENCE = 3;
         int ACTION_NOTIF_PREFERENCE = 4;
     }
+
     public static final String PREF_KEY_APP_HEADER = "pref_app_header";
 
     private static final String TAG = "AppDetailFeature";