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

Commit 8bfc9d47 authored by Joel Galenson's avatar Joel Galenson
Browse files

Fix PreferenceCategory style. 

We were using a PreferenceCategory defined in PermissionController,
which overrode the global one.  By removing it, we can apply themes to
it to look more like Settings.

Fixes: 128439459
Test: View permission screens.
Change-Id: I8dfb518f6dc3cc6e77cc64005f0a6a0786b08168
parent 1ec94cfd

res/layout/preference_category_material.xml

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

<!-- Copyright (C) 2015 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 on frameworks/base/core/res/res/layout/preference_category_material.xml

     but has a ViewGroup at the root to make the support lib happy.-->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <TextView

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dip"

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

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

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

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

        android:paddingTop="16dip" />



</LinearLayout>

res/values/styles.xml

+4 −4
Original line number Diff line number Diff line
@@ -269,13 +269,13 @@ 
        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>



    <style name="AppPermissionMessage">

    <style name="AppPermissionMessage"

           parent="@style/TextAppearance.CategoryTitle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:layout_marginStart">48dp</item>

        <item name="android:textAllCaps">true</item>

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

        <item name="android:layout_marginStart">56dp</item>

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="AppPermissionRadioButton"

res/values/themes.xml

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
    <style name="Settings"

           parent="@android:style/Theme.DeviceDefault.Settings">

        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>

        <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item>

    </style>

    <style name="TextAppearance.CategoryTitle"

           parent="@*android:style/TextAppearance.DeviceDefault.Body2">

        <item name="android:textAllCaps">true</item>

        <item name="android:textSize">11sp</item>

        <!-- 0.8 Spacing, 0.8/11 = 0.072727273 -->

        <item name="android:letterSpacing">0.072727273</item>

    </style>

    <style name="PagedListTheme" parent="Theme.Car.NoActionBar">

        <item name="listItemPrimaryIconTint">?android:attr/textColorPrimary</item>