In Settings->Security & location->Location, the list of apps that have recently requested location was moved up on the screen, and this made it clear that the indentation of the app name was misaligned with the title of Preference items that came after this. It turns out our custom layout for AppPreference reserved a bit more space for icons than regular Preference items. While examining the layout file for location settings I also fixed a small nit in a comment. Fixes: 71056360 Test: Visual (go to Settings->Security & location->Location, and the app names in the list should be indented at the same level as the Preference items below) Change-Id: I87e144c83cc2d13e322f65291415af037c405257
100 lines
4.1 KiB
XML
100 lines
4.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2014 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"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?android:attr/selectableItemBackground"
|
|
android:gravity="center_vertical"
|
|
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
|
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/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="8dp"
|
|
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"
|
|
settings:maxWidth="@dimen/secondary_app_icon_size"
|
|
settings:maxHeight="@dimen/secondary_app_icon_size" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:orientation="vertical"
|
|
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="@style/TextAppearance.TileTitle"
|
|
android:ellipsize="marquee"
|
|
android:fadingEdge="horizontal" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/summary_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone">
|
|
<TextView android:id="@android:id/summary"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:textAppearance="@style/TextAppearance.Small"
|
|
android:textColor="?android:attr/textColorSecondary" />
|
|
|
|
<TextView android:id="@+id/appendix"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:textAppearance="@style/TextAppearance.Small"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:maxLines="1"
|
|
android:ellipsize="end" />
|
|
</LinearLayout>
|
|
<ProgressBar
|
|
android:id="@android:id/progress"
|
|
style="?android:attr/progressBarStyleHorizontal"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:max="100"
|
|
android:visibility="gone" />
|
|
</LinearLayout>
|
|
|
|
<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>
|