8744ed3a05
The support library Preference class has code which hides the reserved space for icons on small screens when there is no icon, but it expects the icon container to have the id 'icon_frame', and our custom layout was using a different id. Bug: 111318404 Test: visual (set display size to Larger or Largest, and visit Developer options; the Stay awake and OEM unlocking switches should be aligned the same as other preferences without icons) Change-Id: I1b5ac43851d77b87fe01f8267bb50ea23086e262
87 lines
3.6 KiB
XML
87 lines
3.6 KiB
XML
<?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.
|
|
-->
|
|
<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/selectableItemBackground"
|
|
android:clipToPadding="false">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/icon_frame"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:minWidth="56dp"
|
|
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: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" />
|
|
|
|
<TextView android:id="@+id/additional_summary"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@android:id/summary"
|
|
android:layout_alignStart="@android:id/summary"
|
|
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:maxLines="10"
|
|
android:visibility="gone" />
|
|
</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>
|