Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev (fce6e177) · Commits · e / os / android_packages_apps_Settings

res/layout/accessibility_autoclick_custom_seekbar.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="60dp"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<TextView
		@@ -29,11 +28,13 @@
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:accessibilityLiveRegion="polite"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="12dp"
		android:gravity="center_vertical">

		<ImageView

res/layout/battery_saver_schedule_percentage_seekbar.xml

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 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.
		-->

		<!-- Layout used by BatterySaverScheduleSeekBarController for the seekbar widget. -->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginVertical="6dp"
		android:gravity="center_vertical"
		android:orientation="vertical"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:layout_marginStart="18dp"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
		android:textColor="?android:attr/textColorPrimary" />

		<com.android.settings.widget.DefaultIndicatorSeekBar
		android:id="@*android:id/seekbar"
		style="@android:style/Widget.Material.SeekBar.Discrete"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:layout_marginStart="18dp"
		android:layout_marginEnd="9dp" />

		</LinearLayout>

res/layout/preference_balance_slider.xml

+3 −18

Original line number	Diff line number	Diff line
		@@ -25,28 +25,13 @@
		android:clickable="false"
		android:orientation="horizontal">

		<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="24dp"
		android:layout_height="24dp"/>
		</LinearLayout>
		<include layout="@layout/settingslib_icon_frame"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_marginTop="8dp"
		android:layout_marginBottom="8dp">
		android:paddingTop="16dp">

		<LinearLayout
		android:layout_width="match_parent"
		@@ -57,7 +42,7 @@
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.Material.Subhead"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:textColor="?android:attr/textColorPrimary"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"/>

res/layout/preference_labeled_slider.xml

+6 −10

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@
		android:gravity="center_vertical"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:paddingStart="56dp"
		android:paddingEnd="8dp"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="16dp"
		android:paddingBottom="8dp">

		@@ -30,12 +30,11 @@
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:layout_alignParentTop="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:singleLine="true"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:textColor="?android:attr/textColorPrimary" />

		<SeekBar
		@@ -43,21 +42,19 @@
		android:layout_below="@android:id/title"
		android:layout_gravity="center_vertical"
		android:layout_width="match_parent"
		android:layout_height="70dp"
		android:layout_marginTop="-20dp"
		android:layout_marginBottom="-28dp"
		android:layout_height="48dp"
		android:paddingStart="0dp"
		android:paddingEnd="0dp"
		style="@android:style/Widget.Material.SeekBar.Discrete" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@*android:id/seekbar"
		android:paddingBottom="8dp"
		android:orientation="horizontal">

		<TextView
		android:id="@android:id/text1"
		android:layout_marginStart="16dp"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_gravity="start\|top"
		@@ -66,7 +63,6 @@

		<TextView
		android:id="@android:id/text2"
		android:layout_marginEnd="16dp"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_gravity="end\|top"

res/layout/preference_volume_slider.xml

+5 −21

Original line number	Diff line number	Diff line
		@@ -25,28 +25,13 @@
		android:clickable="false"
		android:orientation="horizontal">

		<LinearLayout
		android:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="44dp"
		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="24dp"
		android:layout_height="24dp"/>
		</LinearLayout>
		<include layout="@layout/settingslib_icon_frame"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_marginTop="8dp"
		android:layout_marginBottom="8dp">
		android:paddingTop="16dp">

		<LinearLayout
		android:layout_width="match_parent"
		@@ -56,9 +41,8 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:paddingStart="12dp"
		android:singleLine="true"
		android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"/>
		<!-- Preference should place its actual preference widget here. -->
		@@ -79,7 +63,8 @@
		<SeekBar
		android:id="@*android:id/seekbar"
		android:layout_gravity="center_vertical"
		android:paddingStart="12dp"
		android:paddingStart="0dp"
		android:paddingEnd="0dp"
		android:layout_width="match_parent"
		android:layout_height="48dp"/>

		@@ -87,7 +72,6 @@
		android:id="@+id/suppression_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="12dp"
		android:layout_gravity="center_vertical\|start"
		android:textAlignment="viewStart"
		android:singleLine="true"