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

Commit cb7ca801 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adjust preference alignment."

parents d9be860f f28283ae

res/layout/app_preference_item.xml

+1 −2
Original line number Diff line number Diff line
@@ -27,11 +27,10 @@ 
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

    <FrameLayout

        android:id="@+id/icon_frame"

        style="@style/preference_icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:paddingEnd="12dp"

        android:minWidth="56dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <android.support.v7.internal.widget.PreferenceImageView

res/layout/preference_small_icon.xml

deleted100644 → 0
+0 −82
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.

  -->



<!-- Same as preference_material except that it uses a 24dp fixed size icon -->

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

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

              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/selectableItemBackground"

              android:clipToPadding="false"

              android:focusable="true" >



    <LinearLayout

        android:id="@+id/icon_frame"

        style="@style/preference_icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <android.support.v7.internal.widget.PreferenceImageView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            app:maxWidth="24dp"

            app:maxHeight="24dp" />

    </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:singleLine="true"

                  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:maxLines="10" />



    </RelativeLayout>



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

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

                  android:layout_width="wrap_content"

                  android:layout_height="match_parent"

                  android:gravity="end|center_vertical"

                  android:paddingStart="16dp"

                  android:orientation="vertical" />



</LinearLayout>
 
 No newline at end of file

res/layout/storage_item.xml

+1 −2
Original line number Diff line number Diff line
@@ -36,12 +36,11 @@ 


        <LinearLayout

            android:id="@+id/icon_frame"

            style="@style/preference_icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="start|center_vertical"

            android:minWidth="56dp"

            android:orientation="horizontal"

            android:paddingEnd="12dp"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <com.android.internal.widget.PreferenceImageView

res/layout/storage_volume.xml

+1 −2
Original line number Diff line number Diff line
@@ -26,12 +26,11 @@ 


    <LinearLayout

        android:id="@+id/icon_frame"

        style="@style/preference_icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:minWidth="56dp"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView