diff --git a/Android.bp b/Android.bp index 01488d3c..35ed21c9 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,5 @@ // -// Copyright (C) 2018-2021 The LineageOS Project +// Copyright (C) 2018-2022 The LineageOS Project // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -51,7 +51,6 @@ android_app { resource_dirs: [ "lineage/res/res", - "sdk/res/res", ], // Create package-export.apk, which other packages can use to get @@ -66,11 +65,6 @@ lineage_sdk_src = "sdk/src/java/lineageos" lineage_sdk_internal_src = "sdk/src/java/org/lineageos/internal" library_src = "lineage/lib/main/java" -lineage_sdk_LOCAL_STATIC_ANDROID_LIBRARIES = [ - "androidx.preference_preference", - "SettingsLibMainSwitchPreference", -] - lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES = [ "android.hardware.usb-V1.3-java", "vendor.lineage.livedisplay-V2.0-java", @@ -94,7 +88,7 @@ java_library { name: "org.lineageos.platform", installable: true, sdk_version: "core_platform", - static_libs: lineage_sdk_LOCAL_STATIC_ANDROID_LIBRARIES + lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES, + static_libs: lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES, libs: [ "framework", @@ -124,7 +118,7 @@ java_library { java_library { name: "org.lineageos.platform.internal", required: ["services"], - static_libs: lineage_sdk_LOCAL_STATIC_ANDROID_LIBRARIES + lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES, + static_libs: lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES, srcs: [ lineage_sdk_src + "/**/*.java", @@ -149,7 +143,7 @@ java_library { java_library { name: "org.lineageos.platform.sdk", required: ["services"], - static_libs: lineage_sdk_LOCAL_STATIC_ANDROID_LIBRARIES + lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES, + static_libs: lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES, srcs: [ lineage_sdk_src + "/**/*.java", diff --git a/packages/LineagePreferenceLib/Android.bp b/packages/LineagePreferenceLib/Android.bp new file mode 100644 index 00000000..bfeaf5b6 --- /dev/null +++ b/packages/LineagePreferenceLib/Android.bp @@ -0,0 +1,32 @@ +// +// Copyright (C) 2022 The LineageOS 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. +// + +android_library { + name: "LineagePreferenceLib", + min_sdk_version: "30", + static_libs: [ + "androidx.preference_preference", + "SettingsLibMainSwitchPreference", + "org.lineageos.platform", + ], + + srcs: ["java/**/*.java"], + resource_dirs: ["res"], + + aidl: { + local_include_dirs: ["java"], + }, +} diff --git a/packages/LineagePreferenceLib/AndroidManifest.xml b/packages/LineagePreferenceLib/AndroidManifest.xml new file mode 100644 index 00000000..88267244 --- /dev/null +++ b/packages/LineagePreferenceLib/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/sdk/src/java/lineageos/preference/ConstraintsHelper.java b/packages/LineagePreferenceLib/java/lineageos/preference/ConstraintsHelper.java similarity index 97% rename from sdk/src/java/lineageos/preference/ConstraintsHelper.java rename to packages/LineagePreferenceLib/java/lineageos/preference/ConstraintsHelper.java index 06e81a26..19a26fef 100644 --- a/sdk/src/java/lineageos/preference/ConstraintsHelper.java +++ b/packages/LineagePreferenceLib/java/lineageos/preference/ConstraintsHelper.java @@ -43,7 +43,8 @@ import java.util.Objects; import java.util.Set; import lineageos.hardware.LineageHardwareManager; -import lineageos.platform.R; +import static lineageos.preference.R.styleable.lineage_SelfRemovingPreference_minSummaryLines; +import static lineageos.preference.R.styleable.lineage_SelfRemovingPreference_replacesKey; /** @@ -78,8 +79,8 @@ public class ConstraintsHelper { TypedArray a = context.getResources().obtainAttributes(attrs, R.styleable.lineage_SelfRemovingPreference); - mSummaryMinLines = a.getInteger(R.styleable.lineage_SelfRemovingPreference_minSummaryLines, -1); - String replacesKey = a.getString(R.styleable.lineage_SelfRemovingPreference_replacesKey); + mSummaryMinLines = a.getInteger(lineage_SelfRemovingPreference_minSummaryLines, -1); + String replacesKey = a.getString(lineage_SelfRemovingPreference_replacesKey); if (replacesKey != null) { mReplacesKey = replacesKey.split("\\|"); } diff --git a/sdk/src/java/lineageos/preference/GlobalSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/GlobalSettingMainSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/GlobalSettingMainSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/GlobalSettingMainSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/GlobalSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/GlobalSettingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/GlobalSettingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/GlobalSettingSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageGlobalSettingListPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageGlobalSettingListPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageGlobalSettingListPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageGlobalSettingListPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageGlobalSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageGlobalSettingMainSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageGlobalSettingMainSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageGlobalSettingMainSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageGlobalSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageGlobalSettingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageGlobalSettingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageGlobalSettingSwitchPreference.java diff --git a/sdk/src/java/org/lineageos/internal/lineageparts/LineagePartsPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineagePartsPreference.java similarity index 98% rename from sdk/src/java/org/lineageos/internal/lineageparts/LineagePartsPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineagePartsPreference.java index f80d0e3c..cbb6caf0 100644 --- a/sdk/src/java/org/lineageos/internal/lineageparts/LineagePartsPreference.java +++ b/packages/LineagePreferenceLib/java/lineageos/preference/LineagePartsPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.lineageos.internal.lineageparts; +package lineageos.preference; import android.content.Context; import android.os.Bundle; diff --git a/sdk/src/java/lineageos/preference/LineageSecureSettingListPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingListPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSecureSettingListPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingListPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingMainSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageSecureSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSecureSettingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSecureSettingSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageSystemSettingDropDownPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingDropDownPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSystemSettingDropDownPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingDropDownPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageSystemSettingListPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingListPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSystemSettingListPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingListPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingMainSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/LineageSystemSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/LineageSystemSettingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/LineageSystemSettingSwitchPreference.java diff --git a/sdk/src/java/org/lineageos/internal/lineageparts/PartInfo.aidl b/packages/LineagePreferenceLib/java/lineageos/preference/PartInfo.aidl similarity index 93% rename from sdk/src/java/org/lineageos/internal/lineageparts/PartInfo.aidl rename to packages/LineagePreferenceLib/java/lineageos/preference/PartInfo.aidl index 6b7bf160..a84b407b 100644 --- a/sdk/src/java/org/lineageos/internal/lineageparts/PartInfo.aidl +++ b/packages/LineagePreferenceLib/java/lineageos/preference/PartInfo.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package org.lineageos.internal.lineageparts; +package lineageos.preference; parcelable PartInfo; diff --git a/sdk/src/java/org/lineageos/internal/lineageparts/PartInfo.java b/packages/LineagePreferenceLib/java/lineageos/preference/PartInfo.java similarity index 99% rename from sdk/src/java/org/lineageos/internal/lineageparts/PartInfo.java rename to packages/LineagePreferenceLib/java/lineageos/preference/PartInfo.java index bd8a089d..156541b1 100644 --- a/sdk/src/java/org/lineageos/internal/lineageparts/PartInfo.java +++ b/packages/LineagePreferenceLib/java/lineageos/preference/PartInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.lineageos.internal.lineageparts; +package lineageos.preference; import android.content.Intent; import android.os.Parcel; diff --git a/sdk/src/java/org/lineageos/internal/lineageparts/PartsList.java b/packages/LineagePreferenceLib/java/lineageos/preference/PartsList.java similarity index 97% rename from sdk/src/java/org/lineageos/internal/lineageparts/PartsList.java rename to packages/LineagePreferenceLib/java/lineageos/preference/PartsList.java index e7ae6645..ba9d6cfc 100644 --- a/sdk/src/java/org/lineageos/internal/lineageparts/PartsList.java +++ b/packages/LineagePreferenceLib/java/lineageos/preference/PartsList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.lineageos.internal.lineageparts; +package lineageos.preference; import android.content.ComponentName; import android.content.Context; @@ -42,8 +42,8 @@ import static com.android.internal.R.styleable.Preference_icon; import static com.android.internal.R.styleable.Preference_key; import static com.android.internal.R.styleable.Preference_summary; import static com.android.internal.R.styleable.Preference_title; -import static lineageos.platform.R.styleable.lineage_Searchable; -import static lineageos.platform.R.styleable.lineage_Searchable_xmlRes; +import static lineageos.preference.R.styleable.lineage_Searchable; +import static lineageos.preference.R.styleable.lineage_Searchable_xmlRes; public class PartsList { diff --git a/sdk/src/java/lineageos/preference/RemotePreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/RemotePreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/RemotePreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/RemotePreference.java diff --git a/sdk/src/java/lineageos/preference/RemotePreferenceManager.java b/packages/LineagePreferenceLib/java/lineageos/preference/RemotePreferenceManager.java similarity index 100% rename from sdk/src/java/lineageos/preference/RemotePreferenceManager.java rename to packages/LineagePreferenceLib/java/lineageos/preference/RemotePreferenceManager.java diff --git a/sdk/src/java/lineageos/preference/RemotePreferenceUpdater.java b/packages/LineagePreferenceLib/java/lineageos/preference/RemotePreferenceUpdater.java similarity index 100% rename from sdk/src/java/lineageos/preference/RemotePreferenceUpdater.java rename to packages/LineagePreferenceLib/java/lineageos/preference/RemotePreferenceUpdater.java diff --git a/sdk/src/java/lineageos/preference/SecureSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SecureSettingMainSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingMainSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/SecureSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SecureSettingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SecureSettingSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/SelfRemovingDropDownPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingDropDownPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SelfRemovingDropDownPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingDropDownPreference.java diff --git a/sdk/src/java/lineageos/preference/SelfRemovingListPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingListPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SelfRemovingListPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingListPreference.java diff --git a/sdk/src/java/lineageos/preference/SelfRemovingPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SelfRemovingPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingPreference.java diff --git a/sdk/src/java/lineageos/preference/SelfRemovingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SelfRemovingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SelfRemovingSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/SettingsHelper.java b/packages/LineagePreferenceLib/java/lineageos/preference/SettingsHelper.java similarity index 100% rename from sdk/src/java/lineageos/preference/SettingsHelper.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SettingsHelper.java diff --git a/sdk/src/java/lineageos/preference/SystemSettingMainSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SystemSettingMainSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingMainSwitchPreference.java diff --git a/sdk/src/java/lineageos/preference/SystemSettingSwitchPreference.java b/packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java similarity index 100% rename from sdk/src/java/lineageos/preference/SystemSettingSwitchPreference.java rename to packages/LineagePreferenceLib/java/lineageos/preference/SystemSettingSwitchPreference.java diff --git a/sdk/res/res/values/attrs.xml b/packages/LineagePreferenceLib/res/values/attrs.xml similarity index 100% rename from sdk/res/res/values/attrs.xml rename to packages/LineagePreferenceLib/res/values/attrs.xml diff --git a/packages/LineagePreferenceLib/res/values/public.xml b/packages/LineagePreferenceLib/res/values/public.xml new file mode 100644 index 00000000..85a13274 --- /dev/null +++ b/packages/LineagePreferenceLib/res/values/public.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/sdk/res/res/values/symbols.xml b/packages/LineagePreferenceLib/res/values/symbols.xml similarity index 100% rename from sdk/res/res/values/symbols.xml rename to packages/LineagePreferenceLib/res/values/symbols.xml diff --git a/sdk/res/res/values/public.xml b/sdk/res/res/values/public.xml deleted file mode 100644 index d300492a..00000000 --- a/sdk/res/res/values/public.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - -