From: Juan Lang Date: Tue, 9 May 2017 22:42:36 +0000 (-0700) Subject: Depend on SettingsLib's version of lifecycle and FooterMixin. X-Git-Tag: android-x86-9.0-r1~1115^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=777ed2535a7fd6f618a0d12f381af99252283574;p=android-x86%2Fpackages-apps-Settings.git 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 --- diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 109fb0ed31..4123af2d38 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -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; diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 666b3e77b1..8c2a5675bb 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -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; @@ -44,6 +43,7 @@ import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; 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; diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 761e8cf57d..3fc7964a05 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -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; diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index a782a7d7de..2801f045a1 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -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; 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 { diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index fce88aa064..fe6f7b4da4 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -44,10 +44,10 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.widget.FooterPreference; -import com.android.settings.widget.FooterPreferenceMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import com.android.settingslib.widget.FooterPreference; +import com.android.settingslib.widget.FooterPreferenceMixin; import com.google.android.collect.Maps; diff --git a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java index 41352bbdd0..6c99a2ed7b 100644 --- a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java +++ b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java @@ -22,10 +22,10 @@ import android.support.v7.preference.Preference; import android.text.TextUtils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnCreate; -import com.android.settings.core.lifecycle.events.OnSaveInstanceState; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnCreate; +import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; public class ResetAppPrefPreferenceController extends PreferenceController implements LifecycleObserver, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java index 05bc8d60d5..4a8e9c2206 100644 --- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java @@ -26,10 +26,10 @@ import android.support.v7.preference.TwoStatePreference; import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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.Arrays; import java.util.List; diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index e44e70ff78..faee23dd9b 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -28,10 +28,10 @@ import android.support.v7.preference.TwoStatePreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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.Arrays; import java.util.List; diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java index 21dfe19b95..fb7be629be 100644 --- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java @@ -26,10 +26,10 @@ import android.support.v7.preference.TwoStatePreference; import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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.Arrays; import java.util.List; diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java index 032fb13ad8..3443a44d77 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java @@ -27,10 +27,10 @@ import android.text.TextUtils; import com.android.internal.app.AssistUtils; import com.android.settings.applications.defaultapps.DefaultAppInfo; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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.List; diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index 824c0b1c5d..e78e6e16ed 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -22,11 +22,11 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.AssistGesturePreferenceController; 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; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index ba05c3a0fe..db4c3e0fd8 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java @@ -33,13 +33,13 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnResume; -import com.android.settings.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; /** * Controller that shows and updates the bluetooth device name diff --git a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java index 508d6c9558..f9b7975ff9 100644 --- a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java @@ -21,16 +21,16 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 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.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.MasterSwitchController; import com.android.settings.widget.MasterSwitchPreference; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; public class BluetoothMasterSwitchPreferenceController extends PreferenceController implements OnSummaryChangeListener, diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 5b5082d2bb..f3612f9bdc 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -52,7 +52,6 @@ import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.widget.FooterPreference; import com.android.settings.widget.GearPreference; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settings.widget.SwitchBar; @@ -61,6 +60,7 @@ import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 6a1c06c576..cc519a7260 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -24,12 +24,12 @@ import com.android.settings.R; import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController; import com.android.settings.bluetooth.Utils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.deviceinfo.UsbBackend; import com.android.settings.nfc.NfcPreferenceController; 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; diff --git a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java index a98f06893d..9c9ed1265c 100644 --- a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java +++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java @@ -26,10 +26,10 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.core.PreferenceController; import com.android.settings.R; -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.deviceinfo.UsbBackend; +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 UsbModePreferenceController extends PreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java index 9323aa3482..6db57e6d9c 100644 --- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java +++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java @@ -20,9 +20,9 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public abstract class DynamicAvailabilityPreferenceController extends PreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/core/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java index 891af5d005..9b24756b19 100644 --- a/src/com/android/settings/core/InstrumentedActivity.java +++ b/src/com/android/settings/core/InstrumentedActivity.java @@ -18,7 +18,7 @@ package com.android.settings.core; import com.android.settings.core.instrumentation.Instrumentable; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; -import com.android.settings.core.lifecycle.ObservableActivity; +import com.android.settingslib.core.lifecycle.ObservableActivity; /** * Instrumented activity that logs visibility state. diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java index 303d4d8498..188dbde078 100644 --- a/src/com/android/settings/core/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -21,9 +21,9 @@ import android.content.Context; import com.android.settings.core.instrumentation.Instrumentable; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; -import com.android.settings.core.lifecycle.ObservableFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.survey.SurveyMixin; +import com.android.settingslib.core.lifecycle.ObservableFragment; public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable { @@ -49,4 +49,4 @@ public abstract class InstrumentedFragment extends ObservableFragment implements mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity()); super.onResume(); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 746c10d482..bfb69e78a3 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -22,9 +22,9 @@ import android.os.Bundle; import com.android.settings.core.instrumentation.Instrumentable; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; -import com.android.settings.core.lifecycle.ObservablePreferenceFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.survey.SurveyMixin; +import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; /** * Instrumented fragment that logs visibility state. diff --git a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java index dd3c1ccee3..5a9ab56ea9 100644 --- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java +++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java @@ -18,8 +18,8 @@ package com.android.settings.core.instrumentation; import android.content.Context; import com.android.settings.DialogCreatable; -import com.android.settings.core.lifecycle.ObservableDialogFragment; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.ObservableDialogFragment; public abstract class InstrumentedDialogFragment extends ObservableDialogFragment implements Instrumentable { diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java index fcd32d1cb3..8de35adfd7 100644 --- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java +++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java @@ -22,11 +22,11 @@ import android.content.Intent; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnAttach; -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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnAttach; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN; diff --git a/src/com/android/settings/core/lifecycle/Lifecycle.java b/src/com/android/settings/core/lifecycle/Lifecycle.java deleted file mode 100644 index ef236884a1..0000000000 --- a/src/com/android/settings/core/lifecycle/Lifecycle.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.core.lifecycle; - -import android.annotation.UiThread; -import android.content.Context; -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.preference.PreferenceScreen; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -import com.android.settings.core.lifecycle.events.OnAttach; -import com.android.settings.core.lifecycle.events.OnCreate; -import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu; -import com.android.settings.core.lifecycle.events.OnDestroy; -import com.android.settings.core.lifecycle.events.OnOptionsItemSelected; -import com.android.settings.core.lifecycle.events.OnPause; -import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu; -import com.android.settings.core.lifecycle.events.OnResume; -import com.android.settings.core.lifecycle.events.OnSaveInstanceState; -import com.android.settings.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; -import com.android.settings.core.lifecycle.events.SetPreferenceScreen; -import com.android.settings.utils.ThreadUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * Dispatcher for lifecycle events. - */ -public class Lifecycle { - - protected final List mObservers = new ArrayList<>(); - - /** - * Registers a new observer of lifecycle events. - */ - @UiThread - public T addObserver(T observer) { - ThreadUtils.ensureMainThread(); - mObservers.add(observer); - return observer; - } - - public void onAttach(Context context) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnAttach) { - ((OnAttach) observer).onAttach(context); - } - } - } - - public void onCreate(Bundle savedInstanceState) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnCreate) { - ((OnCreate) observer).onCreate(savedInstanceState); - } - } - } - - public void onStart() { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnStart) { - ((OnStart) observer).onStart(); - } - } - } - - public void setPreferenceScreen(PreferenceScreen preferenceScreen) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof SetPreferenceScreen) { - ((SetPreferenceScreen) observer).setPreferenceScreen(preferenceScreen); - } - } - } - - public void onResume() { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnResume) { - ((OnResume) observer).onResume(); - } - } - } - - public void onPause() { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnPause) { - ((OnPause) observer).onPause(); - } - } - } - - public void onSaveInstanceState(Bundle outState) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnSaveInstanceState) { - ((OnSaveInstanceState) observer).onSaveInstanceState(outState); - } - } - } - - public void onStop() { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnStop) { - ((OnStop) observer).onStop(); - } - } - } - - public void onDestroy() { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnDestroy) { - ((OnDestroy) observer).onDestroy(); - } - } - } - - public void onCreateOptionsMenu(final Menu menu, final @Nullable MenuInflater inflater) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnCreateOptionsMenu) { - ((OnCreateOptionsMenu) observer).onCreateOptionsMenu(menu, inflater); - } - } - } - - public void onPrepareOptionsMenu(final Menu menu) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnPrepareOptionsMenu) { - ((OnPrepareOptionsMenu) observer).onPrepareOptionsMenu(menu); - } - } - } - - public boolean onOptionsItemSelected(final MenuItem menuItem) { - for (LifecycleObserver observer : mObservers) { - if (observer instanceof OnOptionsItemSelected) { - if (((OnOptionsItemSelected) observer).onOptionsItemSelected(menuItem)) { - return true; - } - } - } - return false; - } -} diff --git a/src/com/android/settings/core/lifecycle/LifecycleObserver.java b/src/com/android/settings/core/lifecycle/LifecycleObserver.java deleted file mode 100644 index 1f88e853a1..0000000000 --- a/src/com/android/settings/core/lifecycle/LifecycleObserver.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.core.lifecycle; - -/** - * Observer of lifecycle events. - */ -public interface LifecycleObserver { -} diff --git a/src/com/android/settings/core/lifecycle/ObservableActivity.java b/src/com/android/settings/core/lifecycle/ObservableActivity.java deleted file mode 100644 index 006c9ae9a7..0000000000 --- a/src/com/android/settings/core/lifecycle/ObservableActivity.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.core.lifecycle; - -import android.annotation.Nullable; -import android.app.Activity; -import android.os.Bundle; -import android.os.PersistableBundle; -import android.view.Menu; -import android.view.MenuItem; - -/** - * {@link Activity} that has hooks to observe activity lifecycle events. - */ -public class ObservableActivity extends Activity { - - private final Lifecycle mLifecycle = new Lifecycle(); - - protected Lifecycle getLifecycle() { - return mLifecycle; - } - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - mLifecycle.onAttach(this); - super.onCreate(savedInstanceState); - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState, - @Nullable PersistableBundle persistentState) { - mLifecycle.onAttach(this); - super.onCreate(savedInstanceState, persistentState); - } - - @Override - protected void onStart() { - mLifecycle.onStart(); - super.onStart(); - } - - @Override - protected void onResume() { - mLifecycle.onResume(); - super.onResume(); - } - - @Override - protected void onPause() { - mLifecycle.onPause(); - super.onPause(); - } - - @Override - protected void onStop() { - mLifecycle.onStop(); - super.onStop(); - } - - @Override - protected void onDestroy() { - mLifecycle.onDestroy(); - super.onDestroy(); - } - - @Override - public boolean onCreateOptionsMenu(final Menu menu) { - if (super.onCreateOptionsMenu(menu)) { - mLifecycle.onCreateOptionsMenu(menu, null); - return true; - } - return false; - } - - @Override - public boolean onPrepareOptionsMenu(final Menu menu) { - if (super.onPrepareOptionsMenu(menu)) { - mLifecycle.onPrepareOptionsMenu(menu); - return true; - } - return false; - } - - @Override - public boolean onOptionsItemSelected(final MenuItem menuItem) { - boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem); - if (!lifecycleHandled) { - return super.onOptionsItemSelected(menuItem); - } - return lifecycleHandled; - } -} diff --git a/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java b/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java deleted file mode 100644 index f902934094..0000000000 --- a/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.core.lifecycle; - -import android.app.DialogFragment; -import android.content.Context; -import android.support.annotation.VisibleForTesting; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -/** - * {@link DialogFragment} that has hooks to observe fragment lifecycle events. - */ -public class ObservableDialogFragment extends DialogFragment { - - protected final Lifecycle mLifecycle = createLifecycle(); - - @Override - public void onAttach(Context context) { - super.onAttach(context); - mLifecycle.onAttach(context); - } - - @Override - public void onStart() { - mLifecycle.onStart(); - super.onStart(); - } - - @Override - public void onResume() { - mLifecycle.onResume(); - super.onResume(); - } - - @Override - public void onPause() { - mLifecycle.onPause(); - super.onPause(); - } - - @Override - public void onStop() { - mLifecycle.onStop(); - super.onStop(); - } - - @Override - public void onDestroy() { - mLifecycle.onDestroy(); - super.onDestroy(); - } - - @Override - public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) { - mLifecycle.onCreateOptionsMenu(menu, inflater); - super.onCreateOptionsMenu(menu, inflater); - } - - @Override - public void onPrepareOptionsMenu(final Menu menu) { - mLifecycle.onPrepareOptionsMenu(menu); - super.onPrepareOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(final MenuItem menuItem) { - boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem); - if (!lifecycleHandled) { - return super.onOptionsItemSelected(menuItem); - } - return lifecycleHandled; - } - - @VisibleForTesting(otherwise = VisibleForTesting.NONE) - /** @return a new lifecycle. */ - public static Lifecycle createLifecycle() { - return new Lifecycle(); - } -} diff --git a/src/com/android/settings/core/lifecycle/ObservableFragment.java b/src/com/android/settings/core/lifecycle/ObservableFragment.java deleted file mode 100644 index 8dae7ead3c..0000000000 --- a/src/com/android/settings/core/lifecycle/ObservableFragment.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.core.lifecycle; - -import android.annotation.CallSuper; -import android.app.Fragment; -import android.content.Context; -import android.os.Bundle; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -public class ObservableFragment extends Fragment { - - private final Lifecycle mLifecycle = new Lifecycle(); - - protected Lifecycle getLifecycle() { - return mLifecycle; - } - - @CallSuper - @Override - public void onAttach(Context context) { - super.onAttach(context); - mLifecycle.onAttach(context); - } - - @CallSuper - @Override - public void onCreate(Bundle savedInstanceState) { - mLifecycle.onCreate(savedInstanceState); - super.onCreate(savedInstanceState); - } - - @CallSuper - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - mLifecycle.onSaveInstanceState(outState); - } - - @CallSuper - @Override - public void onStart() { - mLifecycle.onStart(); - super.onStart(); - } - - @CallSuper - @Override - public void onStop() { - mLifecycle.onStop(); - super.onStop(); - } - - @CallSuper - @Override - public void onResume() { - mLifecycle.onResume(); - super.onResume(); - } - - @CallSuper - @Override - public void onPause() { - mLifecycle.onPause(); - super.onPause(); - } - - @CallSuper - @Override - public void onDestroy() { - mLifecycle.onDestroy(); - super.onDestroy(); - } - - @CallSuper - @Override - public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) { - mLifecycle.onCreateOptionsMenu(menu, inflater); - super.onCreateOptionsMenu(menu, inflater); - } - - @CallSuper - @Override - public void onPrepareOptionsMenu(final Menu menu) { - mLifecycle.onPrepareOptionsMenu(menu); - super.onPrepareOptionsMenu(menu); - } - - @CallSuper - @Override - public boolean onOptionsItemSelected(final MenuItem menuItem) { - boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem); - if (!lifecycleHandled) { - return super.onOptionsItemSelected(menuItem); - } - return lifecycleHandled; - } -} \ No newline at end of file diff --git a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java deleted file mode 100644 index 94a0be1b68..0000000000 --- a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.core.lifecycle; - - -import android.annotation.CallSuper; -import android.content.Context; -import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -/** - * {@link PreferenceFragment} that has hooks to observe fragment lifecycle events. - */ -public abstract class ObservablePreferenceFragment extends PreferenceFragment { - - private final Lifecycle mLifecycle = new Lifecycle(); - - protected Lifecycle getLifecycle() { - return mLifecycle; - } - - @CallSuper - @Override - public void onAttach(Context context) { - super.onAttach(context); - mLifecycle.onAttach(context); - } - - @CallSuper - @Override - public void onCreate(Bundle savedInstanceState) { - mLifecycle.onCreate(savedInstanceState); - super.onCreate(savedInstanceState); - } - - @Override - public void setPreferenceScreen(PreferenceScreen preferenceScreen) { - mLifecycle.setPreferenceScreen(preferenceScreen); - super.setPreferenceScreen(preferenceScreen); - } - - @CallSuper - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - mLifecycle.onSaveInstanceState(outState); - } - - @CallSuper - @Override - public void onStart() { - mLifecycle.onStart(); - super.onStart(); - } - - @CallSuper - @Override - public void onStop() { - mLifecycle.onStop(); - super.onStop(); - } - - @CallSuper - @Override - public void onResume() { - mLifecycle.onResume(); - super.onResume(); - } - - @CallSuper - @Override - public void onPause() { - mLifecycle.onPause(); - super.onPause(); - } - - @CallSuper - @Override - public void onDestroy() { - mLifecycle.onDestroy(); - super.onDestroy(); - } - - @CallSuper - @Override - public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) { - mLifecycle.onCreateOptionsMenu(menu, inflater); - super.onCreateOptionsMenu(menu, inflater); - } - - @CallSuper - @Override - public void onPrepareOptionsMenu(final Menu menu) { - mLifecycle.onPrepareOptionsMenu(menu); - super.onPrepareOptionsMenu(menu); - } - - @CallSuper - @Override - public boolean onOptionsItemSelected(final MenuItem menuItem) { - boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem); - if (!lifecycleHandled) { - return super.onOptionsItemSelected(menuItem); - } - return lifecycleHandled; - } -} diff --git a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java index 0cc3d15593..92055be376 100644 --- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java +++ b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java @@ -30,10 +30,10 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.Instrumentable; import com.android.settings.core.instrumentation.MetricsFeatureProvider; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnCreate; -import com.android.settings.core.lifecycle.events.OnSaveInstanceState; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnCreate; +import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java index c67fb320af..e1ca617178 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionManager.java +++ b/src/com/android/settings/dashboard/conditional/ConditionManager.java @@ -21,9 +21,9 @@ import android.os.PersistableBundle; import android.util.Log; import android.util.Xml; -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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; diff --git a/src/com/android/settings/datetime/TimeChangeListenerMixin.java b/src/com/android/settings/datetime/TimeChangeListenerMixin.java index f3729ae69a..f93ee0c812 100644 --- a/src/com/android/settings/datetime/TimeChangeListenerMixin.java +++ b/src/com/android/settings/datetime/TimeChangeListenerMixin.java @@ -21,9 +21,9 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; public class TimeChangeListenerMixin extends BroadcastReceiver implements LifecycleObserver, OnPause, OnResume { diff --git a/src/com/android/settings/development/DevelopmentSettingsEnabler.java b/src/com/android/settings/development/DevelopmentSettingsEnabler.java index e97997e791..7132631b94 100644 --- a/src/com/android/settings/development/DevelopmentSettingsEnabler.java +++ b/src/com/android/settings/development/DevelopmentSettingsEnabler.java @@ -20,9 +20,9 @@ import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class DevelopmentSettingsEnabler implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index bee13513c6..5a1835df68 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -35,13 +35,13 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.MetricsFeatureProvider; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnResume; import com.android.settings.development.DevelopmentSettings; import com.android.settings.development.DevelopmentSettingsEnabler; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class BuildNumberPreferenceController extends PreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java index e8792f29a3..1b563011e3 100644 --- a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java @@ -27,10 +27,10 @@ import android.text.TextUtils; import android.util.Log; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnResume; import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class FirmwareVersionPreferenceController extends PreferenceController diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java index 4724c3d864..88b9487668 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java @@ -25,11 +25,11 @@ import android.view.MenuItem; import com.android.settings.R; import com.android.settings.applications.PackageManagerWrapper; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu; -import com.android.settings.core.lifecycle.events.OnOptionsItemSelected; -import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; +import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected; +import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu; import java.util.Objects; diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index a8ca5b9f02..acd34f0fb2 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -26,12 +26,12 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 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.OnResume; import com.android.settings.deletionhelper.ActivationWarningFragment; import com.android.settings.widget.MasterSwitchController; import com.android.settings.widget.MasterSwitchPreference; import com.android.settings.widget.SwitchWidgetController; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class AutomaticStorageManagementSwitchPreferenceController extends PreferenceController implements LifecycleObserver, OnResume, SwitchWidgetController.OnSwitchChangeListener { diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index af2cd8593c..a39cde5432 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -21,11 +21,11 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.MetricsFeatureProvider; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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 AutoRotatePreferenceController extends PreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index a6e5ed742c..3436d2d793 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -31,10 +31,10 @@ import android.support.v7.preference.PreferenceScreen; import android.util.Log; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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.text.NumberFormat; diff --git a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java index 003ed1188c..be41e4d5e6 100644 --- a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java +++ b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.enterprise; import android.Manifest; import android.content.Context; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class AdminGrantedCameraPermissionPreferenceController extends AdminGrantedPermissionsPreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java index 5343483827..77c6040378 100644 --- a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java +++ b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.enterprise; import android.Manifest; import android.content.Context; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class AdminGrantedLocationPermissionsPreferenceController extends AdminGrantedPermissionsPreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java index 64396c54f7..9896420ead 100644 --- a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java +++ b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.enterprise; import android.Manifest; import android.content.Context; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class AdminGrantedMicrophonePermissionPreferenceController extends AdminGrantedPermissionsPreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java index f0aca01a1a..1fe35a3db2 100644 --- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java @@ -21,8 +21,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public abstract class AdminGrantedPermissionsPreferenceControllerBase extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java index e98ece8068..a2ff5b6d8c 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java @@ -18,8 +18,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class AlwaysOnVpnCurrentUserPreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java index 4796b75190..9851252116 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java @@ -16,8 +16,8 @@ package com.android.settings.enterprise; import android.content.Context; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class AlwaysOnVpnManagedProfilePreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceController.java index d020676efb..c5203c774a 100644 --- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java @@ -20,8 +20,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class CaCertsPreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java index acbcc2e23b..9a64788947 100644 --- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java @@ -19,8 +19,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class EnterpriseInstalledPackagesPreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java index 69e0416435..e45373d5ce 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java @@ -18,8 +18,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class EnterprisePrivacyPreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index a80dec015a..b6860e3421 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -22,10 +22,10 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index 2f43a618c7..946631e93d 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -21,9 +21,9 @@ import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; import com.android.settings.users.UserFeatureProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; public class EnterpriseSetDefaultAppsPreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java index d3f9a98245..d7f8dc0506 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java @@ -15,7 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class FailedPasswordWipeCurrentUserPreferenceController extends FailedPasswordWipePreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java index 205d7c1708..739003a588 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java @@ -14,7 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class FailedPasswordWipeManagedProfilePreferenceController extends FailedPasswordWipePreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java index 2f35da6bd2..530de1cbdc 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java @@ -20,8 +20,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public abstract class FailedPasswordWipePreferenceControllerBase extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java index 6ee7fc4cdb..277b623f08 100644 --- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java +++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java @@ -16,8 +16,8 @@ package com.android.settings.enterprise; import android.content.Context; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class GlobalHttpProxyPreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java index b090bed9f5..f2d5ddfb08 100644 --- a/src/com/android/settings/enterprise/ImePreferenceController.java +++ b/src/com/android/settings/enterprise/ImePreferenceController.java @@ -20,8 +20,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.core.DynamicAvailabilityPreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ImePreferenceController extends DynamicAvailabilityPreferenceController { diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index fb59c5924c..9b54385bed 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -63,9 +63,9 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.widget.FooterPreference; import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.widget.FooterPreference; import java.util.List; import java.util.HashMap; diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java index 49a01793d9..f4f6c3667d 100644 --- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java @@ -52,16 +52,16 @@ import com.android.settings.Utils; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.MetricsFeatureProvider; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnDestroy; -import com.android.settings.core.lifecycle.events.OnPause; -import com.android.settings.core.lifecycle.events.OnResume; import com.android.settings.enterprise.DevicePolicyManagerWrapper; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnDestroy; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index 34c9a269b8..5d64f1c80a 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -31,13 +31,13 @@ import android.util.Log; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; import com.android.settings.dashboard.conditional.BatterySaverCondition; import com.android.settings.dashboard.conditional.ConditionManager; import com.android.settings.widget.MasterSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 0a622c7164..ea90744c95 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -75,8 +75,8 @@ import com.android.settings.fuelgauge.anomaly.AnomalyLoader; import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.widget.FooterPreferenceMixin; import com.android.settingslib.BatteryInfo; +import com.android.settingslib.widget.FooterPreferenceMixin; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/AssistGesturePreferenceController.java b/src/com/android/settings/gestures/AssistGesturePreferenceController.java index f0ba8883e3..c59c328c57 100644 --- a/src/com/android/settings/gestures/AssistGesturePreferenceController.java +++ b/src/com/android/settings/gestures/AssistGesturePreferenceController.java @@ -23,10 +23,10 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.applications.assist.AssistSettingObserver; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java index 5334e62e8b..3b4143468a 100644 --- a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java +++ b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java @@ -26,11 +26,11 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SeekBarPreference; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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 AssistGestureSensitivityPreferenceController extends PreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume { diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java index 238b8b62bd..8874e3f56e 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -22,9 +22,9 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java index 3492099e74..35f4bc6e68 100644 --- a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java +++ b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java @@ -22,9 +22,9 @@ import android.support.v7.preference.Preference; import android.util.ArrayMap; import com.android.settings.R; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; +import com.android.settingslib.core.lifecycle.Lifecycle; public class CameraLiftTriggerPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/CameraLiftTriggerSettings.java b/src/com/android/settings/gestures/CameraLiftTriggerSettings.java index eb365038c7..a222b0bc65 100644 --- a/src/com/android/settings/gestures/CameraLiftTriggerSettings.java +++ b/src/com/android/settings/gestures/CameraLiftTriggerSettings.java @@ -22,9 +22,9 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index d38902e50b..df7f7348dd 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -21,9 +21,9 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import android.util.ArrayMap; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; +import com.android.settingslib.core.lifecycle.Lifecycle; public class DoubleTapPowerPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 467cec8ec9..111281f169 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -22,9 +22,9 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index 49e8f51758..38d29a0b0e 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -23,9 +23,9 @@ import android.support.v7.preference.Preference; import android.util.ArrayMap; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; +import com.android.settingslib.core.lifecycle.Lifecycle; public class DoubleTapScreenPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 887ac80d43..20adbbe85d 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -24,9 +24,9 @@ import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index 46a8cbb6f0..5a0ff12c81 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -22,9 +22,9 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index c5174fd536..eb47588bfa 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -26,9 +26,9 @@ import android.text.TextUtils; import android.util.ArrayMap; import com.android.settings.R; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; +import com.android.settingslib.core.lifecycle.Lifecycle; public class DoubleTwistPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index ebfccb5a84..e647bf30df 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -23,11 +23,11 @@ import android.support.v7.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; import com.android.settings.widget.VideoPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; public abstract class GesturePreferenceController extends PreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index ce20f15796..19537f6125 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -23,9 +23,9 @@ import android.support.v7.preference.Preference; import android.util.ArrayMap; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; +import com.android.settingslib.core.lifecycle.Lifecycle; public class PickupGesturePreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 0fe6097f3a..ce4d9d7f4f 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -24,9 +24,9 @@ import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java index 89d38a1e14..821eb04a97 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java @@ -21,9 +21,9 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import android.util.ArrayMap; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.InlineSwitchPayload; import com.android.settings.search2.ResultPayload; +import com.android.settingslib.core.lifecycle.Lifecycle; public class SwipeToNotificationPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 6c136c2431..0cfc9229a1 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -22,9 +22,9 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index f8232b8d81..40efb07b85 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -26,9 +26,9 @@ import android.text.TextUtils; import android.view.InputDevice; 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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; public class GameControllerPreferenceController extends PreferenceController implements InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index aa9f5ad778..03d8221dcb 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -22,11 +22,11 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo; +import com.android.settingslib.core.lifecycle.Lifecycle; +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.List; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 8082f17791..ffaab67f2f 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -36,7 +36,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController; 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.gestures.AssistGesturePreferenceController; @@ -51,6 +50,7 @@ import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController; import com.android.settings.inputmethod.SpellCheckerPreferenceController; import com.android.settings.inputmethod.VirtualKeyboardPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java index b90bc25621..e4d4ca02c3 100644 --- a/src/com/android/settings/location/LocationPreferenceController.java +++ b/src/com/android/settings/location/LocationPreferenceController.java @@ -26,10 +26,10 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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 LocationPreferenceController extends PreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index a25c5f84dc..8422ab44af 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -29,10 +29,10 @@ import com.android.internal.telephony.TelephonyProperties; import com.android.settings.AirplaneModeEnabler; 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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; public class AirplaneModePreferenceController extends PreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index c7abf905cd..b91552e4b1 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -26,9 +26,9 @@ import android.telephony.TelephonyManager; import com.android.settings.Utils; 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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import static android.os.UserHandle.myUserId; import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS; diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index 9d0878f8cd..da4902dd8c 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -32,9 +32,9 @@ import android.util.Log; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnCreate; -import com.android.settings.core.lifecycle.events.OnSaveInstanceState; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnCreate; +import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.List; diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index a28a726469..d567971c3d 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -26,11 +26,11 @@ import android.view.MenuInflater; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.wifi.WifiMasterSwitchPreferenceController; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index 19a22ba990..58d45d6a88 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -32,11 +32,11 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.TetherSettings; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnDestroy; -import com.android.settings.core.lifecycle.events.OnPause; -import com.android.settings.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnDestroy; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index 72b361a563..a62be76d90 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -40,10 +40,10 @@ import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.settings.R; 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.settingslib.RestrictedLockUtils; +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.List; diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index 7164b5b282..074387139d 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -27,12 +27,12 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; 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.network.AirplaneModePreferenceController; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.RestrictedPreference; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java index e9c4b57f8b..cd1f6e39cd 100644 --- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java +++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java @@ -20,8 +20,8 @@ import android.content.Context; import android.media.AudioManager; import com.android.internal.annotations.VisibleForTesting; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.notification.VolumeSeekBarPreference.Callback; +import com.android.settingslib.core.lifecycle.Lifecycle; public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceController { diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index 2035cd2f33..03a71ca705 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -46,10 +46,10 @@ import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.LayoutPreference; import com.android.settings.notification.NotificationBackend.AppRow; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.widget.FooterPreference; import com.android.settings.widget.MasterSwitchPreference; import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.widget.FooterPreference; import java.text.Collator; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index 225ede5974..decbe0b2f1 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java @@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference; import android.util.Log; 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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 27e60c737d..0ce9ec3e7e 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -47,9 +47,9 @@ import com.android.settings.applications.AppHeaderController; import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.LayoutPreference; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.widget.FooterPreference; import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.widget.FooterPreference; public class ChannelNotificationSettings extends NotificationSettingsBase { private static final String TAG = "ChannelSettings"; diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java index 1114b4a662..55cba9677f 100644 --- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java +++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java @@ -22,7 +22,7 @@ import android.content.Context; import android.provider.Settings.Global; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ChargingSoundPreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index a1c52638a7..c3d8b81015 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -22,11 +22,11 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.SwipeToNotificationPreferenceController; 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; diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java index 08e1a7d5d7..e0ca299683 100644 --- a/src/com/android/settings/notification/DialPadTonePreferenceController.java +++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java @@ -23,7 +23,7 @@ import android.content.Context; import android.provider.Settings.System; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class DialPadTonePreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java index 20c20b46e3..f7f13c58ff 100644 --- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java +++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java @@ -24,7 +24,7 @@ import android.content.res.Resources; import android.provider.Settings.Global; import android.telephony.TelephonyManager; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class DockAudioMediaPreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/DockingSoundPreferenceController.java b/src/com/android/settings/notification/DockingSoundPreferenceController.java index ee277f047a..476fd6a990 100644 --- a/src/com/android/settings/notification/DockingSoundPreferenceController.java +++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java @@ -22,7 +22,7 @@ import android.content.Context; import android.provider.Settings.Global; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class DockingSoundPreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/src/com/android/settings/notification/EmergencyTonePreferenceController.java index bc21f44fd7..a67ec8aac3 100644 --- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java +++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java @@ -25,7 +25,7 @@ import android.provider.Settings.Global; import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class EmergencyTonePreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index 73469b0b42..b84d961898 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -32,10 +32,10 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; 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.settingslib.RestrictedLockUtils; +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; diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java index fb8dba55ae..4f167f8750 100644 --- a/src/com/android/settings/notification/MediaVolumePreferenceController.java +++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.notification; import android.content.Context; import android.media.AudioManager; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.notification.VolumeSeekBarPreference.Callback; +import com.android.settingslib.core.lifecycle.Lifecycle; public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceController { diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 695c7967c6..e055133f34 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -26,10 +26,10 @@ import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.LayoutPreference; -import com.android.settings.widget.FooterPreference; import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.widget.FooterPreference; import android.app.Notification; import android.app.NotificationChannel; diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java index 40448a432f..5f888f8af6 100644 --- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java +++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java @@ -21,8 +21,8 @@ import android.media.AudioManager; 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; public class NotificationVolumePreferenceController extends RingVolumePreferenceController { diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index 3e37ab0fc0..d6db8ac931 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference; import android.util.Log; 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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; 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; diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java index f9905c056e..b08b8f8409 100644 --- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java +++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java @@ -22,7 +22,7 @@ import android.content.Context; import android.provider.Settings.System; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ScreenLockSoundPreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 64d65bb841..413b4a2c0e 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -28,10 +28,10 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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.List; public abstract class SettingPrefController extends PreferenceController implements diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index a92c5dd7d6..3dc41e0911 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -32,9 +32,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java index 4ca5ea002d..4e25507aef 100644 --- a/src/com/android/settings/notification/TouchSoundPreferenceController.java +++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java @@ -24,7 +24,7 @@ import android.media.AudioManager; import android.os.AsyncTask; import android.provider.Settings.System; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class TouchSoundPreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java index 544c372994..acb6b4d52c 100644 --- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java +++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java @@ -22,7 +22,7 @@ import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; public class VibrateOnTouchPreferenceController extends SettingPrefController { diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java index 2160f3d260..338b652ee4 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference; import com.android.settings.Utils; 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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import static android.provider.Settings.System.VIBRATE_WHEN_RINGING; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index eeb9c282bb..501cedcd83 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -19,11 +19,11 @@ package com.android.settings.notification; import android.content.Context; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.core.lifecycle.Lifecycle; -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.notification.VolumeSeekBarPreference.Callback; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * Base class for preference controller that handles VolumeSeekBarPreference diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index a80f5037cc..465a2ec3ae 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -45,10 +45,10 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +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 WorkSoundPreferenceController extends PreferenceController implements OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index b781fbb973..f3b18f215b 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -22,10 +22,10 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.accounts.AddUserWhenLockedPreferenceController; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.notification.LockScreenNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index 259ef124ac..a687cb9045 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -25,12 +25,12 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.OwnerInfoSettings; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.OnResume; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnResume; public class OwnerInfoPreferenceController extends PreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java index 4eb14bd381..9b7a9df0c7 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -18,11 +18,11 @@ package com.android.settings.survey; import android.app.Activity; import android.app.Fragment; import android.content.BroadcastReceiver; -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.overlay.SurveyFeatureProvider; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * attaches extra, survey related work to the onResume method of registered observable classes diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index d4685bc0c8..c04e3744d1 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -23,11 +23,11 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.ResetAppPrefPreferenceController; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.NetworkResetPreferenceController; 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; diff --git a/src/com/android/settings/utils/ThreadUtils.java b/src/com/android/settings/utils/ThreadUtils.java deleted file mode 100644 index f71a2a9c26..0000000000 --- a/src/com/android/settings/utils/ThreadUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.utils; - -import android.os.Looper; - -public class ThreadUtils { - private static volatile Thread sMainThread; - - /** - * Returns true if the current thread is the UI thread. - */ - public static boolean isMainThread() { - if (sMainThread == null) { - sMainThread = Looper.getMainLooper().getThread(); - } - return Thread.currentThread() == sMainThread; - } - - /** - * Checks that the current thread is the UI thread. Otherwise throws an exception. - */ - public static void ensureMainThread() { - if (!isMainThread()) { - throw new RuntimeException("Must be called on the UI thread"); - } - } - -} diff --git a/src/com/android/settings/widget/FooterPreference.java b/src/com/android/settings/widget/FooterPreference.java deleted file mode 100644 index 9cb9e113c1..0000000000 --- a/src/com/android/settings/widget/FooterPreference.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.widget; - -import android.content.Context; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; -import android.text.method.LinkMovementMethod; -import android.util.AttributeSet; -import android.widget.TextView; - -import com.android.settings.R; - -/** - * A custom preference acting as "footer" of a page. It has a field for icon and text. It is added - * to screen as the last preference. - */ -public class FooterPreference extends Preference { - - static final int ORDER_FOOTER = Integer.MAX_VALUE - 1; - static final String KEY_FOOTER = "footer_preference"; - - public FooterPreference(Context context, AttributeSet attrs) { - super(context, attrs, TypedArrayUtils.getAttr( - context, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle)); - init(); - } - - public FooterPreference(Context context) { - this(context, null); - } - - @Override - public void onBindViewHolder(PreferenceViewHolder holder) { - super.onBindViewHolder(holder); - TextView title = holder.itemView.findViewById(android.R.id.title); - title.setMovementMethod(new LinkMovementMethod()); - } - - private void init() { - setIcon(R.drawable.ic_info_outline_24dp); - setKey(KEY_FOOTER); - setOrder(ORDER_FOOTER); - } -} diff --git a/src/com/android/settings/widget/FooterPreferenceMixin.java b/src/com/android/settings/widget/FooterPreferenceMixin.java deleted file mode 100644 index 53e3d758e4..0000000000 --- a/src/com/android/settings/widget/FooterPreferenceMixin.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.widget; - -import android.content.Context; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; - -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; -import com.android.settings.core.lifecycle.events.SetPreferenceScreen; - -public class FooterPreferenceMixin implements LifecycleObserver, SetPreferenceScreen { - - private final PreferenceFragment mFragment; - private FooterPreference mFooterPreference; - - public FooterPreferenceMixin(PreferenceFragment fragment, Lifecycle lifecycle) { - mFragment = fragment; - lifecycle.addObserver(this); - } - - @Override - public void setPreferenceScreen(PreferenceScreen preferenceScreen) { - if (mFooterPreference != null) { - preferenceScreen.addPreference(mFooterPreference); - } - } - - /** - * Creates a new {@link FooterPreference}. - */ - public FooterPreference createFooterPreference() { - final PreferenceScreen screen = mFragment.getPreferenceScreen(); - if (mFooterPreference != null && screen != null) { - screen.removePreference(mFooterPreference); - } - mFooterPreference = new FooterPreference(getPrefContext()); - - if (screen != null) { - screen.addPreference(mFooterPreference); - } - return mFooterPreference; - } - - /** - * Returns an UI context with theme properly set for new Preference objects. - */ - private Context getPrefContext() { - return mFragment.getPreferenceManager().getContext(); - } - - public boolean hasFooter() { - return mFooterPreference != null; - } -} - diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index 6e88d79767..7cf19f2883 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -28,10 +28,10 @@ import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * {@link PreferenceController} that controls whether we should notify user when open network is diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 09f5e92ed0..37cd692d27 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -22,10 +22,10 @@ import android.text.TextUtils; import com.android.settings.network.NetworkScoreManagerWrapper; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * {@link PreferenceController} that controls whether a user wants to enable the "use open networks diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index f88e38b18b..238f0e19fd 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -29,10 +29,10 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * {@link PreferenceController} that updates MAC/IP address. diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index 09b3331930..bc61cff0ea 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -20,14 +20,14 @@ import android.support.v7.preference.PreferenceScreen; 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.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; import com.android.settings.widget.SummaryUpdater; import com.android.settings.widget.MasterSwitchPreference; import com.android.settings.widget.MasterSwitchController; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; public class WifiMasterSwitchPreferenceController extends PreferenceController implements SummaryUpdater.OnSummaryChangeListener, diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 9eea74a5ce..9ec4c59e6e 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -29,10 +29,10 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * {@link PreferenceController} that controls whether the Wi-Fi Wakeup feature should be enabled. diff --git a/src/com/android/settings/wifi/WpsPreferenceController.java b/src/com/android/settings/wifi/WpsPreferenceController.java index 736d231114..7aaa7eb939 100644 --- a/src/com/android/settings/wifi/WpsPreferenceController.java +++ b/src/com/android/settings/wifi/WpsPreferenceController.java @@ -31,10 +31,10 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * {@link PreferenceController} that shows Dialog for WPS progress. Disabled when Wi-Fi is off. @@ -151,4 +151,4 @@ public class WpsPreferenceController extends PreferenceController implements return new WpsDialog(getActivity(), mWpsSetup); } } -} \ No newline at end of file +} diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index dd1e4a4d60..2f1139b231 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -53,12 +53,12 @@ import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.MetricsFeatureProvider; -import com.android.settings.core.lifecycle.Lifecycle; -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.vpn2.ConnectivityManagerWrapper; import com.android.settings.wifi.WifiDetailPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.wifi.AccessPoint; import java.net.Inet4Address; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index df871ab6a1..3eb2b7b239 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -25,10 +25,10 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -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.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * {@link PreferenceController} to toggle Wifi Direct preference on Wi-Fi state. diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable index 649f617c18..b0b4051416 100644 --- a/tests/robotests/assets/grandfather_not_implementing_instrumentable +++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable @@ -1,6 +1,4 @@ com.android.settings.deletionhelper.ActivationWarningFragment -com.android.settings.core.lifecycle.ObservableDialogFragment -com.android.settings.core.lifecycle.ObservableFragment com.android.settings.applications.AppOpsCategory com.android.settings.inputmethod.UserDictionaryLocalePicker com.android.settings.CustomEditTextPreference$CustomPreferenceDialogFragment diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java index ee184fde3d..0bff4977d4 100644 --- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java @@ -28,12 +28,12 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme; import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor; import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settingslib.applications.ApplicationsState; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index da8473f1e3..161e376d67 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -24,7 +24,7 @@ import android.support.v7.preference.TwoStatePreference; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index 0b2378c4da..63977cdd85 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.support.v7.preference.TwoStatePreference; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.testutils.shadow.ShadowSecureSettings; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index 8d5e789250..70a95ddfef 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -38,8 +38,8 @@ import android.text.style.ForegroundColorSpan; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java index 38a8356aef..d0cb0d3565 100644 --- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java deleted file mode 100644 index d863143b95..0000000000 --- a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java +++ /dev/null @@ -1,239 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.core.lifecycle; - -import android.content.Context; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -import com.android.settings.SettingsRobolectricTestRunner; -import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.events.OnAttach; -import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu; -import com.android.settings.core.lifecycle.events.OnDestroy; -import com.android.settings.core.lifecycle.events.OnOptionsItemSelected; -import com.android.settings.core.lifecycle.events.OnPause; -import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu; -import com.android.settings.core.lifecycle.events.OnResume; -import com.android.settings.core.lifecycle.events.OnStart; -import com.android.settings.core.lifecycle.events.OnStop; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; -import org.robolectric.util.ActivityController; -import org.robolectric.util.FragmentController; - -import static com.google.common.truth.Truth.assertThat; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class LifecycleTest { - - public static class TestDialogFragment extends ObservableDialogFragment { - - final TestObserver mFragObserver; - - public TestDialogFragment() { - mFragObserver = new TestObserver(); - mLifecycle.addObserver(mFragObserver); - } - } - - public static class TestFragment extends ObservableFragment { - - final TestObserver mFragObserver; - - public TestFragment() { - mFragObserver = new TestObserver(); - getLifecycle().addObserver(mFragObserver); - } - } - - public static class TestActivity extends ObservableActivity { - - final TestObserver mActObserver; - - public TestActivity() { - mActObserver = new TestObserver(); - getLifecycle().addObserver(mActObserver); - } - - } - - public static class TestObserver implements LifecycleObserver, OnAttach, OnStart, OnResume, - OnPause, OnStop, OnDestroy, OnCreateOptionsMenu, OnPrepareOptionsMenu, - OnOptionsItemSelected { - - boolean mOnAttachObserved; - boolean mOnAttachHasContext; - boolean mOnStartObserved; - boolean mOnResumeObserved; - boolean mOnPauseObserved; - boolean mOnStopObserved; - boolean mOnDestroyObserved; - boolean mOnCreateOptionsMenuObserved; - boolean mOnPrepareOptionsMenuObserved; - boolean mOnOptionsItemSelectedObserved; - - @Override - public void onAttach(Context context) { - mOnAttachObserved = true; - mOnAttachHasContext = context != null; - } - - @Override - public void onStart() { - mOnStartObserved = true; - } - - @Override - public void onPause() { - mOnPauseObserved = true; - } - - @Override - public void onResume() { - mOnResumeObserved = true; - } - - @Override - public void onStop() { - mOnStopObserved = true; - } - - @Override - public void onDestroy() { - mOnDestroyObserved = true; - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - mOnCreateOptionsMenuObserved = true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem menuItem) { - mOnOptionsItemSelectedObserved = true; - return true; - } - - @Override - public void onPrepareOptionsMenu(Menu menu) { - mOnPrepareOptionsMenuObserved = true; - } - } - - @Test - public void runThroughActivityLifecycles_shouldObserveEverything() { - ActivityController ac = Robolectric.buildActivity(TestActivity.class); - TestActivity activity = ac.get(); - - ac.start(); - assertThat(activity.mActObserver.mOnStartObserved).isTrue(); - ac.resume(); - assertThat(activity.mActObserver.mOnResumeObserved).isTrue(); - activity.onCreateOptionsMenu(null); - assertThat(activity.mActObserver.mOnCreateOptionsMenuObserved).isTrue(); - activity.onPrepareOptionsMenu(null); - assertThat(activity.mActObserver.mOnPrepareOptionsMenuObserved).isTrue(); - activity.onOptionsItemSelected(null); - assertThat(activity.mActObserver.mOnOptionsItemSelectedObserved).isTrue(); - ac.pause(); - assertThat(activity.mActObserver.mOnPauseObserved).isTrue(); - ac.stop(); - assertThat(activity.mActObserver.mOnStopObserved).isTrue(); - ac.destroy(); - assertThat(activity.mActObserver.mOnDestroyObserved).isTrue(); - } - - @Test - public void runThroughDialogFragmentLifecycles_shouldObserveEverything() { - FragmentController fragmentController = - Robolectric.buildFragment(TestDialogFragment.class); - TestDialogFragment fragment = fragmentController.get(); - - fragmentController.attach().create().start().resume(); - fragment.onCreateOptionsMenu(null, null); - fragment.onPrepareOptionsMenu(null); - fragment.onOptionsItemSelected(null); - fragmentController.pause().stop().destroy(); - - assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue(); - assertThat(fragment.mFragObserver.mOnStartObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnStopObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnCreateOptionsMenuObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnPrepareOptionsMenuObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnOptionsItemSelectedObserved).isTrue(); - } - - @Test - public void runThroughFragmentLifecycles_shouldObserveEverything() { - FragmentController fragmentController = - Robolectric.buildFragment(TestFragment.class); - TestFragment fragment = fragmentController.get(); - - fragmentController.attach().create().start().resume(); - fragment.onCreateOptionsMenu(null, null); - fragment.onPrepareOptionsMenu(null); - fragment.onOptionsItemSelected(null); - fragmentController.pause().stop().destroy(); - - assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue(); - assertThat(fragment.mFragObserver.mOnStartObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnStopObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnCreateOptionsMenuObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnPrepareOptionsMenuObserved).isTrue(); - assertThat(fragment.mFragObserver.mOnOptionsItemSelectedObserved).isTrue(); - } - - private static class OptionItemAccepter implements LifecycleObserver, OnOptionsItemSelected { - public boolean wasCalled = false; - - @Override - public boolean onOptionsItemSelected(MenuItem menuItem) { - wasCalled = true; - return false; - } - } - - @Test - public void onOptionItemSelectedShortCircuitsIfAnObserverHandlesTheMenuItem() { - FragmentController fragmentController = - Robolectric.buildFragment(TestFragment.class); - TestFragment fragment = fragmentController.get(); - OptionItemAccepter accepter = new OptionItemAccepter(); - fragment.getLifecycle().addObserver(accepter); - - fragmentController.attach().create().start().resume(); - fragment.onCreateOptionsMenu(null, null); - fragment.onPrepareOptionsMenu(null); - fragment.onOptionsItemSelected(null); - fragmentController.pause().stop().destroy(); - - assertThat(accepter.wasCalled).isFalse(); - } -} diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index 8a8c066af0..bd85958b53 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -21,9 +21,9 @@ import android.content.Intent; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -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.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 4475d18915..8dcb7d5a8e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -29,9 +29,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.development.DevelopmentSettings; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.search2.DatabaseIndexingManager; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java index 732ba2260e..02d526390b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java @@ -22,7 +22,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 823e4c8ceb..02dea50d6c 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -25,9 +25,9 @@ import android.support.v14.preference.SwitchPreference; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowSystemSettings; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.After; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java index a341d8361d..2008afd9a3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java @@ -45,12 +45,12 @@ import android.widget.Button; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.enterprise.DevicePolicyManagerWrapper; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 96563814e9..2341a6465a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -19,8 +19,8 @@ import android.content.Context; import android.os.PowerManager; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.widget.MasterSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index d82faf4c82..72fa51158a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -35,8 +35,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.widget.MasterSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 3dc6892b6e..74de5d0088 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -23,8 +23,8 @@ import android.support.v7.preference.TwoStatePreference; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.widget.VideoPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index ac6c78ba69..fe67449134 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -41,10 +41,10 @@ import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.LifecycleObserver; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.shadow.ShadowSecureSettings; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index 882a9abede..f87f18bc6c 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -27,8 +27,8 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settings.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 1ae40aa129..70872eeb4d 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.telephony.TelephonyManager; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 2a0b873a72..27baa1b7d0 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 25581b93a2..8bcb5b2a0e 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -25,7 +25,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java deleted file mode 100644 index 4267ed18f8..0000000000 --- a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.utils; - - -import com.android.settings.TestConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; - -import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.fail; - -@RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class ThreadUtilsTest { - - @Test - public void testMainThread() throws InterruptedException { - assertThat(ThreadUtils.isMainThread()).isTrue(); - Thread background = new Thread(new Runnable() { - public void run() { - assertThat(ThreadUtils.isMainThread()).isFalse(); - } - }); - background.start(); - background.join(); - } - - @Test - public void testEnsureMainThread() throws InterruptedException { - ThreadUtils.ensureMainThread(); - Thread background = new Thread(new Runnable() { - public void run() { - try { - ThreadUtils.ensureMainThread(); - fail("Should not pass ensureMainThread in a background thread"); - } catch (RuntimeException e) { - } - } - }); - background.start(); - background.join(); - } -} diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java deleted file mode 100644 index 21ebb253ad..0000000000 --- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.widget; - -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; - -import com.android.settings.SettingsRobolectricTestRunner; -import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; - -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class FooterPreferenceMixinTest { - - @Mock - private PreferenceFragment mFragment; - @Mock - private PreferenceScreen mScreen; - - private Lifecycle mLifecycle; - private FooterPreferenceMixin mMixin; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mLifecycle = new Lifecycle(); - when(mFragment.getPreferenceManager()).thenReturn(mock(PreferenceManager.class)); - when(mFragment.getPreferenceManager().getContext()) - .thenReturn(ShadowApplication.getInstance().getApplicationContext()); - mMixin = new FooterPreferenceMixin(mFragment, mLifecycle); - } - - @Test - public void createFooter_screenNotAvailable_noCrash() { - assertThat(mMixin.createFooterPreference()).isNotNull(); - } - - @Test - public void createFooter_screenAvailable_canAttachToScreen() { - when(mFragment.getPreferenceScreen()).thenReturn(mScreen); - - final FooterPreference preference = mMixin.createFooterPreference(); - - assertThat(preference).isNotNull(); - verify(mScreen).addPreference(preference); - } - - @Test - public void createFooter_screenAvailableDelayed_canAttachToScreen() { - final FooterPreference preference = mMixin.createFooterPreference(); - - mLifecycle.setPreferenceScreen(mScreen); - - assertThat(preference).isNotNull(); - verify(mScreen).addPreference(preference); - } - - @Test - public void createFooterTwice_screenAvailable_replaceOldFooter() { - when(mFragment.getPreferenceScreen()).thenReturn(mScreen); - - mMixin.createFooterPreference(); - mMixin.createFooterPreference(); - - verify(mScreen).removePreference(any(FooterPreference.class)); - verify(mScreen, times(2)).addPreference(any(FooterPreference.class)); - } - -} diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java deleted file mode 100644 index 885ac689cd..0000000000 --- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.widget; - -import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; -import android.text.method.LinkMovementMethod; -import android.view.LayoutInflater; -import android.widget.TextView; - -import com.android.settings.R; -import com.android.settings.SettingsRobolectricTestRunner; -import com.android.settings.TestConfig; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; - -import static com.google.common.truth.Truth.assertThat; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class FooterPreferenceTest { - - private Context mContext; - - @Before - public void setUp() { - mContext = ShadowApplication.getInstance().getApplicationContext(); - } - - @Test - public void createNewPreference_shouldSetKeyAndOrder() { - final FooterPreference preference = new FooterPreference(mContext); - - assertThat(preference.getKey()).isEqualTo(FooterPreference.KEY_FOOTER); - assertThat(preference.getOrder()).isEqualTo(FooterPreference.ORDER_FOOTER); - } - - @Test - public void bindPreference_shouldLinkifyContent() { - final FooterPreference preference = new FooterPreference(mContext); - final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests( - LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null)); - - preference.onBindViewHolder(holder); - assertThat(((TextView) holder.findViewById(android.R.id.title)).getMovementMethod()) - .isInstanceOf(LinkMovementMethod.class); - } -} diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index 75b304e572..a3a3e551bb 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -30,7 +30,7 @@ import android.support.v7.preference.Preference; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index 5b55006136..27e6f856d1 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -39,7 +39,7 @@ import android.support.v7.preference.Preference; import com.android.settings.network.NetworkScoreManagerWrapper; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index 40c480ff2e..47e3b4cf20 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 61981c45fa..067a4ab4ea 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -32,8 +32,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.testutils.shadow.SettingsShadowResources; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.After; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java index ac0861efe2..8953c09296 100644 --- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java @@ -33,7 +33,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 208c1570c0..9601c492a3 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -58,9 +58,9 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.instrumentation.MetricsFeatureProvider; -import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.vpn2.ConnectivityManagerWrapperImpl; import com.android.settings.wifi.WifiDetailPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.wifi.AccessPoint; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index 06caadf87e..ede407ebb8 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test;