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

Commit c5270721 authored by Antony Sargent's avatar Antony Sargent
Browse files

Remove preference_category_material_settings.xml 

This layout was moved to the support library as a part of the work for
b/64689839, so we don't need a copy of it in SettingsLib anymore.

Bug: 110037570
Test: compile (all consumers of SettingsLib should no longer be
referencing this layout)

Change-Id: I084898a35f18427ca15c8e103af34b3e90b9a85e
parent 1bd43cf6

packages/SettingsLib/res/layout/preference_category_material_settings.xml

deleted100644 → 0
+0 −68
Original line number Original line 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.

  -->



<!-- 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:fontFamily="@*android:string/config_headlineFontFamilyMedium"

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

            android:textAlignment="viewStart"

            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

packages/SettingsLib/res/layout/preference_category_material_settings_with_divider.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,5 +24,5 @@ 
    android:layout_height="wrap_content">

    android:layout_height="wrap_content">





    <include layout="@layout/preference_category_divider"/>

    <include layout="@layout/preference_category_divider"/>

    <include layout="@layout/preference_category_material_settings"/>

    <include layout="@layout/preference_category_material"/>

</LinearLayout>
 
</LinearLayout>