Settings Fragment Migration (Build pass app)

This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b

2 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/settings/users/MultiUserFooterPreferenceController.java b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
index 877df581ee..f42f1909d9 100644
--- a/src/com/android/settings/users/MultiUserFooterPreferenceController.java
+++ b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixin;
+import com.android.settingslib.widget.FooterPreferenceMixinCompat;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -31,14 +31,15 @@ public class MultiUserFooterPreferenceController extends BasePreferenceControlle
     @VisibleForTesting
     final UserCapabilities mUserCaps;
 
-    private FooterPreferenceMixin mFooterMixin;
+    private FooterPreferenceMixinCompat mFooterMixin;
 
     public MultiUserFooterPreferenceController(Context context) {
         super(context, "dummy_key");
         mUserCaps = UserCapabilities.create(context);
     }
 
-    public MultiUserFooterPreferenceController setFooterMixin(FooterPreferenceMixin footerMixin) {
+    public MultiUserFooterPreferenceController setFooterMixin(
+            FooterPreferenceMixinCompat footerMixin) {
         mFooterMixin = footerMixin;
         return this;
     }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 931fdcf28c..7d84d9903b 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -216,7 +216,7 @@ public class UserSettings extends SettingsPreferenceFragment
         final SwitchBar switchBar = activity.getSwitchBar();
         mSwitchBarController = new MultiUserSwitchBarController(activity,
                 new SwitchBarController(switchBar), this /* listener */);
-        getLifecycle().addObserver(mSwitchBarController);
+        getSettingsLifecycle().addObserver(mSwitchBarController);
         switchBar.show();
     }