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/notification/RingVolumePreferenceController.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/notification/RingVolumePreferenceController.java')
-rw-r--r-- | src/com/android/settings/notification/RingVolumePreferenceController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index a94d0861e2..8b7822507f 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -33,8 +33,8 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.Utils; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.notification.VolumeSeekBarPreference.Callback; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.Objects; |