Merge "Move code in settingslib/devicestate into its own module" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
31cee94c8f
@@ -50,6 +50,7 @@ android_library {
|
|||||||
"SettingsLibTwoTargetPreference",
|
"SettingsLibTwoTargetPreference",
|
||||||
"SettingsLibSettingsTransition",
|
"SettingsLibSettingsTransition",
|
||||||
"SettingsLibButtonPreference",
|
"SettingsLibButtonPreference",
|
||||||
|
"SettingsLibDeviceStateRotationLock",
|
||||||
"setupdesign",
|
"setupdesign",
|
||||||
"zxing-core-1.7",
|
"zxing-core-1.7",
|
||||||
],
|
],
|
||||||
|
|||||||
16
packages/SettingsLib/DeviceStateRotationLock/Android.bp
Normal file
16
packages/SettingsLib/DeviceStateRotationLock/Android.bp
Normal file
@@ -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",
|
||||||
|
}
|
||||||
@@ -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>
|
||||||
@@ -25,7 +25,7 @@ android_test {
|
|||||||
name: "SettingsLibTests",
|
name: "SettingsLibTests",
|
||||||
defaults: [
|
defaults: [
|
||||||
"SettingsLibDefaults",
|
"SettingsLibDefaults",
|
||||||
"framework-wifi-test-defaults"
|
"framework-wifi-test-defaults",
|
||||||
],
|
],
|
||||||
|
|
||||||
certificate: "platform",
|
certificate: "platform",
|
||||||
@@ -47,6 +47,7 @@ android_test {
|
|||||||
"androidx.test.espresso.core",
|
"androidx.test.espresso.core",
|
||||||
"mockito-target-minus-junit4",
|
"mockito-target-minus-junit4",
|
||||||
"truth-prebuilt",
|
"truth-prebuilt",
|
||||||
|
"SettingsLibDeviceStateRotationLock",
|
||||||
"SettingsLibSettingsSpinner",
|
"SettingsLibSettingsSpinner",
|
||||||
"SettingsLibUsageProgressBarPreference",
|
"SettingsLibUsageProgressBarPreference",
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user