From 042c5b40b78dfa4e7da1179feb5099da7d96ee0d Mon Sep 17 00:00:00 2001 From: Ahaan Ugale Date: Sun, 7 Mar 2021 10:34:18 -0800 Subject: [PATCH] Use androidx LifecycleObserver for wiring up controller lifecycles. DashboardFragment automatically wires up Controllers that implement the deprecated settingslib LifecycleObserver. Now it can also work for those that implement the androidx version. The settingslib LifecycleObserver extends the androidx one, so existing behaviour is preserved. Bug: 169455298 Test: manual - lifecycles work automatically for such Controllers Test: manual - no duplicate lifecycle events for existing Controllers Change-Id: I39ac69f24bf8577867ba3b7e56f96c5f38722a2f --- src/com/android/settings/dashboard/DashboardFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index 1b2be809a6d..7acbd1997c5 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -27,6 +27,7 @@ import android.util.Log; import androidx.annotation.CallSuper; import androidx.annotation.VisibleForTesting; +import androidx.lifecycle.LifecycleObserver; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; @@ -44,7 +45,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.ProviderTile;