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

Commit a5f0a82f authored by Juan Lang's avatar Juan Lang Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'footer-settingslib' 

* changes:
  Depend on SettingsLib's version of lifecycle and FooterMixin.
  Add a factory method to create a Lifecycle.
parents b13d0c5d 777ed253

src/com/android/settings/DeviceInfoSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.provider.SearchIndexableResource; 


import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.core.lifecycle.Lifecycle;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
@@ -42,6 +41,7 @@ import com.android.settings.deviceinfo.SafetyInfoPreferenceController; 
import com.android.settings.deviceinfo.SecurityPatchPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.util.ArrayList;

import java.util.Arrays;

src/com/android/settings/DisplaySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.provider.SearchIndexableResource; 
import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.core.lifecycle.Lifecycle;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.display.AutoBrightnessPreferenceController;

import com.android.settings.display.AutoRotatePreferenceController;
@@ -46,6 +45,7 @@ import com.android.settings.gestures.PickupGesturePreferenceController; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.util.ArrayList;

import java.util.List;

src/com/android/settings/SettingsPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ import com.android.settings.applications.LayoutPreference; 
import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.instrumentation.Instrumentable;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.widget.FooterPreferenceMixin;

import com.android.settingslib.HelpUtils;

import com.android.settingslib.widget.FooterPreferenceMixin;



import java.util.UUID;

src/com/android/settings/accounts/AccountPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -47,14 +47,14 @@ import com.android.settings.SettingsPreferenceFragment; 
import com.android.settings.Utils;

import com.android.settings.core.PreferenceController;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;

import com.android.settings.core.lifecycle.LifecycleObserver;

import com.android.settings.core.lifecycle.events.OnPause;

import com.android.settings.core.lifecycle.events.OnResume;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settings.search2.SearchFeatureProviderImpl;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.accounts.AuthenticatorHelper;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;



import java.util.ArrayList;

import java.util.Collections;

src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import android.provider.Settings.Global; 
import android.support.v7.preference.Preference;



import com.android.settings.core.PreferenceController;

import com.android.settings.core.lifecycle.LifecycleObserver;

import com.android.settings.core.lifecycle.events.OnPause;

import com.android.settings.core.lifecycle.events.OnResume;

import com.android.settings.users.UserCapabilities;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;



public class AddUserWhenLockedPreferenceController extends PreferenceController

        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume {