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

Commit 403ff146 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove custom layout for expandpreference. 

It's no longer needed.
Test: manual
Change-Id: I704255ee217d1142ac81c738feef212224bae4e8
parent e9686e32

res/layout/expand_preference.xml

deleted100644 → 0
+0 −75
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_material.xml -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical"

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

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

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

    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="60dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxWidth="48dp"

            android:maxHeight="48dp"/>

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:ellipsize="marquee"/>



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

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

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

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

            android:ellipsize="marquee"

            android:maxLines="1"/>



    </RelativeLayout>



</LinearLayout>

src/com/android/settings/dashboard/ExpandPreference.java

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ public class ExpandPreference extends Preference { 
    }



    private void init() {

        setLayoutResource(R.layout.expand_preference);

        setIcon(R.drawable.ic_arrow_down_24dp);

        setTitle(R.string.advanced_section_header);

        setOrder(999);