diff options
| author | Juan Lang <juanlang@google.com> | 2017-05-09 15:42:36 -0700 |
|---|---|---|
| committer | Juan Lang <juanlang@google.com> | 2017-05-12 11:10:46 -0700 |
| commit | 777ed2535a7fd6f618a0d12f381af99252283574 (patch) | |
| tree | 24ea05df271f02be4a3d35fca8d6082eab57a525 /src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java | |
| parent | e1fc16892ea0037fcd490a15f2279c9148b91d20 (diff) | |
| download | packages_apps_Settings-777ed2535a7fd6f618a0d12f381af99252283574.tar.gz packages_apps_Settings-777ed2535a7fd6f618a0d12f381af99252283574.tar.bz2 packages_apps_Settings-777ed2535a7fd6f618a0d12f381af99252283574.zip | |
Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.
Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
&& make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
Diffstat (limited to 'src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java index 10e3610099..a3dd94d1c7 100644 --- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java @@ -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 { |