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

Commit 80d1ec7d authored by Fan Zhang's avatar Fan Zhang
Browse files

Tweak UI for action buttons under app header. 

- Make a transparent button with border style

Bug: 1584976
Test: manual
Change-Id: Ide53d71963afd4587834357999b40df81bb93500
parent 5f6bb20e

res/drawable/button_bg_transparent.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?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

res/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -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"/>

src/com/android/settings/applications/AppHeaderController.java

+1 −2
Original line number Diff line number Diff line
@@ -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";