diff options
author | 2022-05-02 10:07:00 +0000 | |
---|---|---|
committer | 2022-05-02 12:15:23 +0000 | |
commit | afb021d75e6877cced751ccfa42c4be63dcd1708 (patch) | |
tree | f0969e0dc301efe766e5101a512de2d60d75f787 | |
parent | 61435b3d8232010babc2b3e13a0fc7923d425d9d (diff) |
Move code in settingslib/devicestate into its own module
Code in SettingsProvider will need to use DeviceStateRotationLockSettingsManager,
but shouldn't have to pull in the entire SettingsLib just for one class.
Bug: 196933725
Test: atest DeviceStateRotationLockSettingsManagerTest
Test: build Android
Change-Id: I93679700c1638396c5930386c82fa23f1f3ad6a0
-rw-r--r-- | packages/SettingsLib/Android.bp | 1 | ||||
-rw-r--r-- | packages/SettingsLib/DeviceStateRotationLock/Android.bp | 16 | ||||
-rw-r--r-- | packages/SettingsLib/DeviceStateRotationLock/AndroidManifest.xml | 21 | ||||
-rw-r--r-- | packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/AndroidSecureSettings.java (renamed from packages/SettingsLib/src/com/android/settingslib/devicestate/AndroidSecureSettings.java) | 0 | ||||
-rw-r--r-- | packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/DeviceStateRotationLockSettingsManager.java (renamed from packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java) | 0 | ||||
-rw-r--r-- | packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/SecureSettings.java (renamed from packages/SettingsLib/src/com/android/settingslib/devicestate/SecureSettings.java) | 0 | ||||
-rw-r--r-- | packages/SettingsLib/tests/integ/Android.bp | 3 |
7 files changed, 40 insertions, 1 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 9a80b0267976..87e61b527477 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -50,6 +50,7 @@ android_library { "SettingsLibTwoTargetPreference", "SettingsLibSettingsTransition", "SettingsLibButtonPreference", + "SettingsLibDeviceStateRotationLock", "setupdesign", "zxing-core-1.7", ], diff --git a/packages/SettingsLib/DeviceStateRotationLock/Android.bp b/packages/SettingsLib/DeviceStateRotationLock/Android.bp new file mode 100644 index 000000000000..c642bd14ed79 --- /dev/null +++ b/packages/SettingsLib/DeviceStateRotationLock/Android.bp @@ -0,0 +1,16 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +android_library { + name: "SettingsLibDeviceStateRotationLock", + + srcs: ["src/**/*.java"], + + min_sdk_version: "21", +} diff --git a/packages/SettingsLib/DeviceStateRotationLock/AndroidManifest.xml b/packages/SettingsLib/DeviceStateRotationLock/AndroidManifest.xml new file mode 100644 index 000000000000..bce6599721e3 --- /dev/null +++ b/packages/SettingsLib/DeviceStateRotationLock/AndroidManifest.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 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. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.settingslib.devicestate"> + +</manifest> diff --git a/packages/SettingsLib/src/com/android/settingslib/devicestate/AndroidSecureSettings.java b/packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/AndroidSecureSettings.java index 8aee576c3d04..8aee576c3d04 100644 --- a/packages/SettingsLib/src/com/android/settingslib/devicestate/AndroidSecureSettings.java +++ b/packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/AndroidSecureSettings.java diff --git a/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java b/packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/DeviceStateRotationLockSettingsManager.java index 4ed7e19f341d..4ed7e19f341d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java +++ b/packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/DeviceStateRotationLockSettingsManager.java diff --git a/packages/SettingsLib/src/com/android/settingslib/devicestate/SecureSettings.java b/packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/SecureSettings.java index 10528739b2b0..10528739b2b0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/devicestate/SecureSettings.java +++ b/packages/SettingsLib/DeviceStateRotationLock/src/com.android.settingslib.devicestate/SecureSettings.java diff --git a/packages/SettingsLib/tests/integ/Android.bp b/packages/SettingsLib/tests/integ/Android.bp index 64563be78fbb..d463170fae8c 100644 --- a/packages/SettingsLib/tests/integ/Android.bp +++ b/packages/SettingsLib/tests/integ/Android.bp @@ -25,7 +25,7 @@ android_test { name: "SettingsLibTests", defaults: [ "SettingsLibDefaults", - "framework-wifi-test-defaults" + "framework-wifi-test-defaults", ], certificate: "platform", @@ -47,6 +47,7 @@ android_test { "androidx.test.espresso.core", "mockito-target-minus-junit4", "truth-prebuilt", + "SettingsLibDeviceStateRotationLock", "SettingsLibSettingsSpinner", "SettingsLibUsageProgressBarPreference", ], |