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

Commit 10906821 authored by Ethan Chen's avatar Ethan Chen Committed by Bruno Martins
Browse files

Update style to match Oreo Settings 

Use the same theme settings the Oreo Settings app uses,
so our preferences don't look out of place.

Change-Id: Idafccb09a3b23de7f568e0ab32b602fe11bd0af3
parent 27097a5f

res/drawable/ic_actionbar_delete.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:viewportHeight="24"

    android:tint="?android:attr/colorAccent">



    <path

        android:fillColor="#FFFFFFFF"

res/drawable/ic_menu_trash_holo_dark.xml

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

<!--

     Copyright (C) 2017 The LineageOS 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M6 19c0 1.1 .9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />

</vector>

res/drawable/switchbar_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@color/switchbar_background_color" />

    <item android:drawable="?android:attr/colorSecondary" />

</ripple>

res/layout/preference_category_material_settings.xml

0 → 100644
+66 −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.

  -->



<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml

     except that this supports icon -->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dp"

    android:layout_marginBottom="8dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart" >



    <LinearLayout

        android:id="@+id/icon_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:orientation="horizontal">

        <com.android.internal.widget.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:tint="?android:attr/textColorPrimary"

            android:maxWidth="18dp"

            android:maxHeight="18dp"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="56dp"

        android:orientation="vertical">

        <TextView

            android:id="@android:id/title"

            android:layout_marginTop="16dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="@android:style/TextAppearance.Material.Body2"

            android:textColor="?android:attr/colorAccent"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>

        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:ellipsize="end"

            android:singleLine="true" />

    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

res/layout/preference_material_settings.xml

+19 −13
Original line number Diff line number Diff line
@@ -16,21 +16,22 @@ 


<!-- Based off frameworks/base/core/res/res/layout/preference_material.xml

     except that this has the negative margin on the image removed. -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/activatedBackgroundIndicator"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <LinearLayout

        android:id="@id/icon_frame"

        android:id="@+id/icon_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="60dp"

        android:minWidth="56dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"
@@ -48,19 +49,23 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">

        android:paddingTop="12dp"

        android:paddingBottom="12dp">



        <TextView android:id="@android:id/title"

        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minHeight="24dp"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"/>



        <TextView android:id="@android:id/summary"

        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minHeight="24dp"

            android:layout_below="@android:id/title"

            android:layout_alignStart="@android:id/title"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
@@ -70,7 +75,8 @@ 
    </RelativeLayout>



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout android:id="@android:id/widget_frame"

    <LinearLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"