diff options
4 files changed, 8 insertions, 4 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 0cb85d8638b0..b997c35668d2 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -42,6 +42,8 @@ android_library { "SettingsLibIllustrationPreference", "SettingsLibLayoutPreference", "SettingsLibMainSwitchPreference", + "SettingsLibMetadata", + "SettingsLibPreference", "SettingsLibProfileSelector", "SettingsLibProgressBar", "SettingsLibRestrictedLockUtils", diff --git a/packages/SettingsLib/Preference/Android.bp b/packages/SettingsLib/Preference/Android.bp index 9665dbd17e2d..17852e8e7ece 100644 --- a/packages/SettingsLib/Preference/Android.bp +++ b/packages/SettingsLib/Preference/Android.bp @@ -18,6 +18,7 @@ android_library { "SettingsLibMetadata", "androidx.annotation_annotation", "androidx.preference_preference", + "guava", ], kotlincflags: ["-Xjvm-default=all"], } diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt index 207200998b05..68f640bbb9b4 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceFragment.kt @@ -79,7 +79,7 @@ open class PreferenceFragment : * This is for flagging purpose. If false (e.g. flag is disabled), xml resource is used to build * preference screen. */ - protected open fun usePreferenceScreenMetadata(): Boolean = true + protected open fun usePreferenceScreenMetadata(): Boolean = false /** Returns the xml resource to create preference screen. */ @XmlRes protected open fun getPreferenceScreenResId(context: Context): Int = 0 diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java index bd1e5a588968..79949248cd8a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java @@ -31,13 +31,14 @@ import android.view.MenuInflater; import android.view.MenuItem; import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; +import com.android.settingslib.preference.PreferenceFragment; + /** - * {@link PreferenceFragmentCompat} that has hooks to observe fragment lifecycle events. + * Preference fragment that has hooks to observe fragment lifecycle events. */ -public abstract class ObservablePreferenceFragment extends PreferenceFragmentCompat +public abstract class ObservablePreferenceFragment extends PreferenceFragment implements LifecycleOwner { private final Lifecycle mLifecycle = new Lifecycle(this); |