From b8616dc4d19d5a719ca705d8bd6e96140933a1a0 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Tue, 17 Apr 2018 09:50:46 -0700 Subject: [PATCH 1/2] Migrated SystemUI & SettingsLib to androidx Test: make SystemUI SettingsLib Bug:76692459 Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95 Merged-In: I248fdf4042a0a97bc6349091da21c936c2d37c95 (cherry picked from commit fd52c1433c4e4d3f53aef2454d03f6b58f2411a3) (cherry picked from commit d366771e84f584330c21b6381c902518af110034) (cherry picked from commit a14377a450a7172963ab7ec1b3e47444a3249216) --- packages/SettingsLib/Android.mk | 14 +++++----- packages/SettingsLib/common.mk | 16 +++++------ .../res/layout/preference_access_point.xml | 2 +- .../res/layout/preference_two_target.xml | 2 +- .../settingslib/CustomDialogPreference.java | 4 +-- .../settingslib/CustomEditTextPreference.java | 6 ++-- .../android/settingslib/DeviceInfoUtils.java | 2 +- .../settingslib/RestrictedLockUtils.java | 2 +- .../settingslib/RestrictedPreference.java | 6 ++-- .../RestrictedPreferenceHelper.java | 4 +-- .../RestrictedSwitchPreference.java | 8 +++--- .../com/android/settingslib/TetherUtil.java | 2 +- .../settingslib/TwoTargetPreference.java | 4 +-- .../applications/ApplicationsState.java | 8 +++--- .../applications/StorageStatsSource.java | 2 +- .../bluetooth/CachedBluetoothDevice.java | 2 +- .../LocalBluetoothProfileManager.java | 2 +- .../android/settingslib/bluetooth/Utils.java | 2 +- .../core/AbstractPreferenceController.java | 6 ++-- .../core/ConfirmationDialogController.java | 4 +-- .../SharedPreferencesLogger.java | 2 +- .../VisibilityLoggerMixin.java | 6 ++-- .../settingslib/core/lifecycle/Lifecycle.java | 20 ++++++------- .../core/lifecycle/LifecycleObserver.java | 4 +-- .../core/lifecycle/ObservableActivity.java | 14 +++++----- .../lifecycle/ObservableDialogFragment.java | 14 +++++----- .../core/lifecycle/ObservableFragment.java | 14 +++++----- .../ObservablePreferenceFragment.java | 18 ++++++------ .../core/lifecycle/events/OnCreate.java | 4 +-- .../core/lifecycle/events/OnDestroy.java | 4 +-- .../core/lifecycle/events/OnPause.java | 4 +-- .../core/lifecycle/events/OnResume.java | 4 +-- .../core/lifecycle/events/OnStart.java | 4 +-- .../core/lifecycle/events/OnStop.java | 4 +-- .../lifecycle/events/SetPreferenceScreen.java | 2 +- .../settingslib/datetime/ZoneGetter.java | 6 ++-- ...AbstractEnableAdbPreferenceController.java | 12 ++++---- .../AbstractLogdSizePreferenceController.java | 10 +++---- ...bstractLogpersistPreferenceController.java | 10 +++---- .../DeveloperOptionsPreferenceController.java | 4 +-- .../DevelopmentSettingsEnabler.java | 2 +- .../development/SystemPropPoker.java | 4 +-- ...tBluetoothAddressPreferenceController.java | 6 ++-- ...AbstractImsStatusPreferenceController.java | 6 ++-- ...AbstractIpAddressPreferenceController.java | 6 ++-- ...tractSerialNumberPreferenceController.java | 6 ++-- .../AbstractUptimePreferenceController.java | 6 ++-- ...actWifiMacAddressPreferenceController.java | 6 ++-- .../settingslib/drawer/CategoryManager.java | 2 +- .../fuelgauge/PowerWhitelistBackend.java | 2 +- .../graph/BluetoothDeviceLayerDrawable.java | 2 +- .../InputMethodAndSubtypeEnablerManager.java | 10 +++---- .../InputMethodAndSubtypeUtil.java | 8 +++--- .../inputmethod/InputMethodPreference.java | 6 ++-- .../InputMethodSubtypePreference.java | 2 +- .../SwitchWithNoTextPreference.java | 2 +- .../license/LicenseHtmlGeneratorFromXml.java | 2 +- .../license/LicenseHtmlLoader.java | 2 +- .../location/RecentLocationApps.java | 2 +- .../notification/ZenDurationDialog.java | 2 +- .../suggestions/SuggestionController.java | 4 +-- .../SuggestionControllerMixin.java | 6 ++-- .../users/AppRestrictionsHelper.java | 2 +- .../android/settingslib/utils/IconCache.java | 4 +-- .../android/settingslib/utils/PowerUtil.java | 2 +- .../settingslib/widget/FooterPreference.java | 6 ++-- .../widget/FooterPreferenceMixin.java | 4 +-- .../android/settingslib/wifi/AccessPoint.java | 2 +- .../wifi/AccessPointPreference.java | 6 ++-- .../wifi/TestAccessPointBuilder.java | 2 +- .../android/settingslib/wifi/WifiTracker.java | 6 ++-- .../settingslib/wifi/WifiTrackerFactory.java | 4 +-- .../android/settingslib/wifi/WifiUtils.java | 2 +- .../RestrictedPreferenceHelperTest.java | 4 +-- .../settingslib/TwoTargetPreferenceTest.java | 2 +- .../AbstractPreferenceControllerTest.java | 4 +-- .../VisibilityLoggerMixinTest.java | 2 +- .../core/lifecycle/LifecycleTest.java | 4 +-- ...eloperOptionsPreferenceControllerTest.java | 4 +-- .../EnableAdbPreferenceControllerTest.java | 6 ++-- .../LogdSizePreferenceControllerTest.java | 4 +-- .../LogpersistPreferenceControllerTest.java | 8 +++--- ...etoothAddressPreferenceControllerTest.java | 4 +-- .../ImsStatusPreferenceControllerTest.java | 4 +-- .../IpAddressPreferenceControllerTest.java | 4 +-- .../SerialNumberPreferenceControllerTest.java | 4 +-- .../UptimePreferenceControllerTest.java | 4 +-- ...ifiMacAddressPreferenceControllerTest.java | 4 +-- .../SuggestionControllerMixinTest.java | 6 ++-- .../widget/FooterPreferenceMixinTest.java | 8 +++--- .../widget/FooterPreferenceTest.java | 2 +- packages/SystemUI/Android.mk | 28 +++++++++---------- packages/SystemUI/AndroidManifest.xml | 4 +-- packages/SystemUI/proguard.flags | 4 +-- .../res/layout/qs_customize_panel_content.xml | 2 +- .../res/layout/tuner_shortcut_list.xml | 2 +- .../keyguard/KeyguardSecurityContainer.java | 2 +- .../android/keyguard/KeyguardSliceView.java | 4 +-- .../android/keyguard/KeyguardStatusView.java | 2 +- .../android/systemui/ScreenDecorations.java | 2 +- .../DozeScreenStatePreventingAdapter.java | 2 +- ...zeSuspendScreenStatePreventingAdapter.java | 2 +- .../fragments/FragmentHostManager.java | 2 +- .../power/PowerNotificationWarnings.java | 2 +- .../android/systemui/qs/PagedTileLayout.java | 4 +-- .../src/com/android/systemui/qs/QSFooter.java | 2 +- .../com/android/systemui/qs/QSFooterImpl.java | 4 +-- .../com/android/systemui/qs/QSFragment.java | 4 +-- .../android/systemui/qs/QSScrollLayout.java | 2 +- .../systemui/qs/QuickStatusBarHeader.java | 2 +- .../android/systemui/qs/car/CarQSFooter.java | 2 +- .../systemui/qs/car/CarQSFragment.java | 6 ++-- .../systemui/qs/car/CarStatusBarHeader.java | 2 +- .../systemui/qs/customize/QSCustomizer.java | 6 ++-- .../systemui/qs/customize/TileAdapter.java | 14 +++++----- .../systemui/qs/external/TileColorPicker.java | 2 +- .../qs/external/TileLifecycleManager.java | 2 +- .../qs/external/TileServiceManager.java | 2 +- .../systemui/qs/tileimpl/SlashImageView.java | 2 +- .../systemui/qs/tiles/NightDisplayTile.java | 2 +- .../systemui/qs/touch/SwipeDetector.java | 4 +-- .../systemui/recents/TriangleShape.java | 2 +- .../recents/views/TaskViewHeader.java | 2 +- .../systemui/statusbar/CommandQueue.java | 2 +- .../NotificationBlockingHelperManager.java | 2 +- .../systemui/statusbar/NotificationGuts.java | 2 +- .../statusbar/NotificationGutsManager.java | 2 +- .../android/systemui/statusbar/ScrimView.java | 2 +- .../systemui/statusbar/StatusBarIconView.java | 2 +- .../statusbar/car/FullscreenUserSwitcher.java | 2 +- .../statusbar/car/UserGridRecyclerView.java | 6 ++-- .../MediaNotificationProcessor.java | 4 +-- .../notification/RowInflaterTask.java | 2 +- .../notification/VisualStabilityManager.java | 2 +- .../statusbar/phone/HeadsUpManagerPhone.java | 2 +- .../phone/NavigationBarFragment.java | 2 +- .../statusbar/phone/NavigationBarView.java | 2 +- .../statusbar/phone/NearestTouchFrame.java | 2 +- .../phone/NotificationGroupManager.java | 2 +- .../phone/NotificationIconAreaController.java | 4 +-- .../phone/NotificationIconContainer.java | 2 +- .../NotificationsQuickSettingsContainer.java | 2 +- .../statusbar/phone/QuickStepController.java | 2 +- .../phone/StatusBarIconController.java | 2 +- .../statusbar/policy/IconLoggerImpl.java | 2 +- .../policy/LocationControllerImpl.java | 2 +- .../statusbar/stack/AnimationFilter.java | 2 +- .../stack/NotificationStackScrollLayout.java | 6 ++-- .../systemui/tuner/BatteryPreference.java | 2 +- .../systemui/tuner/BetterListPreference.java | 2 +- .../systemui/tuner/ClockPreference.java | 2 +- .../systemui/tuner/CustomListPreference.java | 4 +-- .../systemui/tuner/DemoModeFragment.java | 10 +++---- .../systemui/tuner/LockscreenFragment.java | 14 +++++----- .../android/systemui/tuner/NavBarTuner.java | 6 ++-- .../android/systemui/tuner/OtherPrefs.java | 2 +- .../systemui/tuner/PluginFragment.java | 8 +++--- .../systemui/tuner/RadioListPreference.java | 6 ++-- .../systemui/tuner/SelectablePreference.java | 2 +- .../systemui/tuner/ShortcutPicker.java | 10 +++---- .../systemui/tuner/StatusBarSwitch.java | 2 +- .../android/systemui/tuner/TunerActivity.java | 6 ++-- .../android/systemui/tuner/TunerFragment.java | 4 +-- .../tuner/TunerPreferenceFragment.java | 4 +-- .../android/systemui/tuner/TunerSwitch.java | 2 +- .../android/systemui/util/leak/DumpTruck.java | 2 +- .../systemui/util/leak/LeakReporter.java | 2 +- .../systemui/util/wakelock/WakeLock.java | 2 +- .../systemui/volume/MediaRouterWrapper.java | 4 +-- packages/SystemUI/tests/Android.mk | 28 +++++++++---------- 170 files changed, 390 insertions(+), 390 deletions(-) diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk index 7b89fb243d380..96012c1f2a34b 100644 --- a/packages/SettingsLib/Android.mk +++ b/packages/SettingsLib/Android.mk @@ -8,17 +8,17 @@ LOCAL_AAPT2_ONLY := true LOCAL_MODULE := SettingsLib LOCAL_JAVA_LIBRARIES := \ - android-support-annotations + androidx.annotation_annotation LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-arch-lifecycle-runtime + androidx.legacy_legacy-support-v4 \ + androidx.recyclerview_recyclerview \ + androidx.preference_preference \ + androidx.appcompat_appcompat \ + androidx.lifecycle_lifecycle-runtime LOCAL_SHARED_JAVA_LIBRARIES := \ - android-arch-lifecycle-common + androidx.lifecycle_lifecycle-common LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 5de3a6e994402..834b83b49ada3 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -14,15 +14,15 @@ # LOCAL_STATIC_JAVA_LIBRARIES += \ - android-support-annotations \ - android-arch-lifecycle-common + androidx.annotation_annotation \ + androidx.lifecycle_lifecycle-common LOCAL_STATIC_ANDROID_LIBRARIES += \ - android-support-v4 \ - android-arch-lifecycle-runtime \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-support-v14-preference \ + androidx.legacy_legacy-support-v4 \ + androidx.lifecycle_lifecycle-runtime \ + androidx.recyclerview_recyclerview \ + androidx.preference_preference \ + androidx.appcompat_appcompat \ + androidx.legacy_legacy-preference-v14 \ SettingsLib diff --git a/packages/SettingsLib/res/layout/preference_access_point.xml b/packages/SettingsLib/res/layout/preference_access_point.xml index 62173da5b7ebc..472a6e3d0dd4d 100644 --- a/packages/SettingsLib/res/layout/preference_access_point.xml +++ b/packages/SettingsLib/res/layout/preference_access_point.xml @@ -45,7 +45,7 @@ android:clipToPadding="false" android:paddingTop="4dp" android:paddingBottom="4dp"> - - > { + androidx.lifecycle.LifecycleObserver, LoaderManager.LoaderCallbacks> { public interface SuggestionControllerHost { /** diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java index 0fc9a4d6e408e..7cdbe719df784 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java @@ -31,7 +31,7 @@ import android.graphics.drawable.Drawable; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.inputmethod.InputMethodInfo; diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java b/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java index 3d55c4fee358c..f0548ff7a9231 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java @@ -19,8 +19,8 @@ package com.android.settingslib.utils; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; -import android.support.annotation.VisibleForTesting; -import android.support.v4.util.ArrayMap; +import androidx.annotation.VisibleForTesting; +import androidx.collection.ArrayMap; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java index a53ff39043465..e16da84ce7134 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java @@ -22,7 +22,7 @@ import android.icu.text.MeasureFormat; import android.icu.text.MeasureFormat.FormatWidth; import android.icu.util.Measure; import android.icu.util.MeasureUnit; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.android.settingslib.R; diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java index e6935516f4010..87a56c7548d25 100644 --- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java @@ -17,9 +17,9 @@ package com.android.settingslib.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 androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; import android.util.AttributeSet; import android.widget.TextView; diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java index 2edcd9e2c0666..5883754fa2ed8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java +++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java @@ -17,8 +17,8 @@ package com.android.settingslib.widget; import android.content.Context; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 50dfc26d6a2b7..b9c76013b0d76 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -48,7 +48,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java index 26f3683f92b4b..b07dd8f183545 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java @@ -25,9 +25,9 @@ import android.graphics.drawable.StateListDrawable; import android.net.wifi.WifiConfiguration; import android.os.Looper; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.util.SparseArray; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java index 2993a0de06580..5862e6f19e16e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java @@ -24,7 +24,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.android.settingslib.wifi.AccessPoint.Speed; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index d8f0886730d8a..6211d1214fcc6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -41,9 +41,9 @@ import android.os.Message; import android.os.Process; import android.os.SystemClock; import android.provider.Settings; -import android.support.annotation.GuardedBy; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.ArraySet; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java index 8b5863aee91ff..e73d952cd645e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java @@ -16,8 +16,8 @@ package com.android.settingslib.wifi; import android.content.Context; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java index bee2fa1359576..4792317c9f1e7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java @@ -21,7 +21,7 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.os.SystemClock; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.settingslib.R; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java index a8821ba607850..f00ae0b08019f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.TextView; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java index 480143a79410a..efd7de351ebed 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java index 393fd029e6da9..5261ea0c88bb1 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import org.junit.Before; import org.junit.Test; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java index 8b31450f8a3f1..f34c33844d11f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java @@ -30,7 +30,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java index 2b2bf5b6cc8b4..52068e9842e5c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java @@ -15,10 +15,10 @@ */ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_START; import static com.google.common.truth.Truth.assertThat; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.view.Menu; import android.view.MenuInflater; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java index 7820fd2fe340f..9dd93b3af390b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java @@ -19,8 +19,8 @@ package com.android.settingslib.development; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java index 475e7d8c2209c..7c653351974ac 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java @@ -26,9 +26,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java index 72c8d1ad3642e..ae3072ca86b87 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java @@ -40,8 +40,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java index 4b9bfc3f37cab..b0aaa256fdab2 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java index 0385f4bd29af4..8ec7149ce1a86 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.doReturn; import android.bluetooth.BluetoothAdapter; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java index d600c2093c777..cb7861b30562d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.mock; import android.content.Context; import android.os.PersistableBundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java index 99e582cae60a0..8f144cdf3a154 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java index a4fa7aa29bef9..69fb86e88d5b9 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java @@ -20,8 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java index 39e05faddc1ab..ba955f9f22751 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.SystemClock; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.format.DateUtils; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java index b7bc661116e94..ddbcb87725d15 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java index cfa16b8a952ab..f486989f5a569 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java @@ -16,15 +16,15 @@ package com.android.settingslib.suggestions; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.LoaderManager; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java index 8071c6db4cfdc..78b7616716f5c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java @@ -23,10 +23,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java index ff11b803c0530..3280089a88f69 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java @@ -19,7 +19,7 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.widget.TextView; diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index df2115147fb24..d9ec0fd0214b0 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -37,20 +37,20 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \ SystemUIPluginLib \ SystemUISharedLib \ - android-support-car \ - android-support-v4 \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-support-v7-mediarouter \ - android-support-v7-palette \ - android-support-v14-preference \ - android-support-v17-leanback \ - android-slices-core \ - android-slices-view \ - android-slices-builders \ - android-arch-core-runtime \ - android-arch-lifecycle-extensions \ + androidx.car_car \ + androidx.legacy_legacy-support-v4 \ + androidx.recyclerview_recyclerview \ + androidx.preference_preference \ + androidx.appcompat_appcompat \ + androidx.mediarouter_mediarouter \ + androidx.palette_palette \ + androidx.legacy_legacy-preference-v14 \ + androidx.leanback_leanback \ + androidx.slice_slice-core \ + androidx.slice_slice-view \ + androidx.slice_slice-builders \ + androidx.arch.core_core-runtime \ + androidx.lifecycle_lifecycle-extensions \ LOCAL_STATIC_JAVA_LIBRARIES := \ SystemUI-tags \ diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 5599b5a2837ab..beb4e9e5ba9c0 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -229,7 +229,7 @@ android:theme="@style/Theme.SystemUI" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" - android:appComponentFactory="android.support.v4.app.CoreComponentFactory"> + android:appComponentFactory="androidx.core.app.CoreComponentFactory"> @@ -594,7 +594,7 @@ diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags index 4b5d10e8d1904..e6452e717d5e2 100644 --- a/packages/SystemUI/proguard.flags +++ b/packages/SystemUI/proguard.flags @@ -36,9 +36,9 @@ public (android.content.Context, android.util.AttributeSet); } --keep class ** extends android.support.v14.preference.PreferenceFragment +-keep class ** extends androidx.preference.PreferenceFragment -keep class com.android.systemui.tuner.* -keep class com.android.systemui.plugins.** { public protected *; } --keep class android.support.v4.app.CoreComponentFactory +-keep class androidx.core.app.CoreComponentFactory diff --git a/packages/SystemUI/res/layout/qs_customize_panel_content.xml b/packages/SystemUI/res/layout/qs_customize_panel_content.xml index d70a37ae15b2d..4ce6ef6ed31de 100644 --- a/packages/SystemUI/res/layout/qs_customize_panel_content.xml +++ b/packages/SystemUI/res/layout/qs_customize_panel_content.xml @@ -38,7 +38,7 @@ android:navigationContentDescription="@*android:string/action_bar_up_description" style="?android:attr/toolbarStyle" /> - - Date: Mon, 23 Apr 2018 17:31:10 -0700 Subject: [PATCH 2/2] Migrated various apps under frameworks/base/packages/Shell to androidx Bug: 76692459 Test: make Shell Change-Id: If11159cac1bd5aa61c46a346647b97a661abbf11 Merged-In: If11159cac1bd5aa61c46a346647b97a661abbf11 (cherry picked from commit e92135a6e9e3bae6236063d35670f3f7f2f51be4) (cherry picked from commit 474df059db94fac9a279e5f90ab0c046de4a3e08) (cherry picked from commit e0efaddbebaf9cdabe4253d7f3cfdf87dc9a7446) --- packages/Shell/Android.mk | 3 ++- packages/Shell/AndroidManifest.xml | 2 +- .../Shell/src/com/android/shell/BugreportProgressService.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/Shell/Android.mk b/packages/Shell/Android.mk index 5713dc679341f..b738d77714658 100644 --- a/packages/Shell/Android.mk +++ b/packages/Shell/Android.mk @@ -12,7 +12,8 @@ LOCAL_SRC_FILES += \ LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 +LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4 +LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := Shell LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index b4f331d89074f..8a5cb4a6d643a 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -157,7 +157,7 @@ android:defaultToDeviceProtectedStorage="true" android:directBootAware="true"> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 600f0dc377755..4fc190d430560 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -88,7 +88,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.os.Vibrator; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log;