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

Commit 8148370f authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Introducing SliderPreferenceBinding 

Reverse the dependency for PreferenceBinding.

Bug: 390338213
Flag: EXEMPT library
Test: atest
Change-Id: I07af8a9ca401dc486f0ab2082c682b5517078bba
parent 4511d3b8

packages/SettingsLib/DataStore/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ android_library { 
    defaults: [

        "SettingsLintDefaults",

    ],

    min_sdk_version: "21",

    srcs: [":SettingsLibDataStore-srcs"],

    static_libs: [

        "androidx.annotation_annotation",

packages/SettingsLib/Metadata/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ android_library { 
    defaults: [

        "SettingsLintDefaults",

    ],

    min_sdk_version: "21",

    srcs: [":SettingsLibMetadata-srcs"],

    static_libs: [

        "SettingsLibDataStore",

packages/SettingsLib/Preference/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ android_library { 
    defaults: [

        "SettingsLintDefaults",

    ],

    min_sdk_version: "21",

    srcs: [":SettingsLibPreference-srcs"],

    static_libs: [

        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibMainSwitchPreference",

        "SettingsLibSliderPreference",

        "androidx.annotation_annotation",

        "androidx.preference_preference",

        "guava",

packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt

+0 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.settingslib.metadata.getPreferenceIcon 
import com.android.settingslib.metadata.getPreferenceScreenTitle

import com.android.settingslib.metadata.getPreferenceSummary

import com.android.settingslib.metadata.getPreferenceTitle

import com.android.settingslib.widget.SliderPreference



/** Binding of preference widget and preference metadata. */

interface PreferenceBinding {
@@ -125,10 +124,6 @@ interface PreferenceBinding { 
                preference.min = getMinValue(context)

                preference.max = getMaxValue(context)

                preference.seekBarIncrement = getIncrementStep(context)

            } else if (preference is SliderPreference && this is IntRangeValuePreference) {

                preference.min = getMinValue(context)

                preference.max = getMaxValue(context)

                preference.sliderIncrement = getIncrementStep(context)

            }

        }

    }

packages/SettingsLib/SliderPreference/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -14,12 +14,16 @@ android_library { 
        "SettingsLintDefaults",

    ],



    srcs: ["src/**/*.java"],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

    resource_dirs: ["res"],



    static_libs: [

        "androidx.annotation_annotation",

        "androidx.preference_preference",

        "SettingsLibPreference",

        "SettingsLibSettingsTheme",

    ],