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

Commit 4aad4a88 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev

parents 5fd29ebe d6b5bbb5

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_labeled_slider.xml

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2019 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

  -->



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

    android:layout_width="match_parent"

    android:gravity="center_vertical"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingStart="56dp"

    android:paddingEnd="8dp"

    android:paddingTop="16dp"

    android:paddingBottom="8dp">



    <TextView

        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:textColor="?android:attr/textColorPrimary" />



    <SeekBar

        android:id="@*android:id/seekbar"

        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"

        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"

            android:gravity="start"

            android:layout_weight="1"/>



        <TextView

            android:id="@android:id/text2"

            android:layout_marginEnd="16dp"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_gravity="end|top"

            android:gravity="end"

            android:layout_weight="1"/>



    </LinearLayout>



</RelativeLayout>

res/layout/preference_volume_slider.xml

+2 −17
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"

res/layout/preference_widget_seekbar_settings.xml

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

-->



<!-- Layout used by SeekBarPreference for the seekbar widget style. -->

<RelativeLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="6dp"

    android:layout_marginBottom="6dp"

    android:gravity="center_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:fadingEdge="horizontal"

        android:paddingStart="56dp"

        android:paddingEnd="8dp"

        android:singleLine="true"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"

        android:textColor="?android:attr/textColorPrimary" />



    <TextView

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

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

        android:maxLines="4"

        android:paddingStart="56dp"

        android:paddingEnd="8dp"

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

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



    <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_alignParentEnd="true"

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

        android:paddingStart="56dp"

        android:paddingEnd="12dp" />



</RelativeLayout>

res/values/attrs.xml

+0 −7
Original line number Diff line number Diff line
@@ -157,13 +157,6 @@ 
        <attr name="textOff" format="reference" />

    </declare-styleable>



    <!-- For LabeledSeekBarPreference -->

    <declare-styleable name="LabeledSeekBarPreference">

        <attr name="textStart" format="reference" />

        <attr name="textEnd" format="reference" />

        <attr name="tickMark" format="reference" />

    </declare-styleable>



    <declare-styleable name="TintDrawable">

        <attr name="android:tint" />

        <attr name="android:drawable" />