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

Commit 859017e9 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Use SettingsLib's ActionButtonsPreference"

parents 82b5cb30 8ad18fb3

res/layout/settings_action_buttons.xml

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 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:paddingStart="8dp"

    android:orientation="horizontal">



    <Button

        android:id="@+id/button1"

        style="@style/SettingsActionButton"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"/>



    <Button

        android:id="@+id/button2"

        style="@style/SettingsActionButton"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"/>



    <Button

        android:id="@+id/button3"

        style="@style/SettingsActionButton"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"/>



    <Button

        android:id="@+id/button4"

        style="@style/SettingsActionButton"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"/>

</LinearLayout>
 
 No newline at end of file

res/values/styles.xml

+0 −10
Original line number Diff line number Diff line
@@ -401,16 +401,6 @@ 


    <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>



    <style name="SettingsActionButton"

           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">

        <item name="android:drawablePadding">4dp</item>

        <item name="android:drawableTint">@*android:color/btn_colored_borderless_text_material

        </item>

        <item name="android:layout_marginEnd">8dp</item>

        <item name="android:paddingTop">20dp</item>

        <item name="android:paddingBottom">20dp</item>

    </style>



    <style name="LockPatternContainerStyle">

        <item name="android:maxHeight">400dp</item>

        <item name="android:maxWidth">420dp</item>

res/xml/app_info_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        settings:allowDividerAbove="true"

        settings:allowDividerBelow="true"/>



    <com.android.settings.widget.ActionButtonPreference

    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="action_buttons"

        android:order="-9998" />

res/xml/app_storage_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/storage_label">



    <com.android.settings.widget.ActionButtonPreference

    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="header_view" />



    <com.android.settings.applications.SpacePreference

res/xml/bluetooth_device_details_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:selectable="false"

        settings:allowDividerBelow="true"/>



    <com.android.settings.widget.ActionButtonPreference

    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="action_buttons" />



    <PreferenceCategory