commit fee2fdfde9db29737ed6220d5966ae118c2453ce
author Jacky Wang <jiannan@google.com> Mon Sep 09 20:58:46 2024 +0800
committer Jacky Wang <jiannan@google.com> Tue Sep 10 14:45:21 2024 +0800
tree b4913a77b996b796398163b41fc37c36fe6edbb7
parent e511546f7fb29832a2e4d36cc9c675d9de711656

Catalyst framework integration

Bug: 335132588
Flag: com.android.settingslib.flags.settings_catalyst
Test: Presubmit
Change-Id: I3bff53074e2de5d88889f7f42848402a38bcda03

packages/SettingsLib/Preference/Android.bp

diff --git a/packages/SettingsLib/Preference/Android.bp b/packages/SettingsLib/Preference/Android.bp
index 9665dbd..17852e8 100644
--- a/packages/SettingsLib/Preference/Android.bp
+++ b/packages/SettingsLib/Preference/Android.bp
@@ -18,6 +18,7 @@
         "SettingsLibMetadata",
         "androidx.annotation_annotation",
         "androidx.preference_preference",
+        "guava",
     ],
     kotlincflags: ["-Xjvm-default=all"],
 }

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

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 2072009..68f640b 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 @@
      * 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