devicesettings: Switch to Blueprint

* Needed to make build system happy with what we link.

Change-Id: I6549c681e1c41a3b9d76dc04b75a25c946384bd2
This commit is contained in:
tmakin authored and Nolen Johnson committed 2024-01-29 13:43:29 -05:00
1 parent b22d2237ef
commit 3aba489f08
4 files changed
+56 -85

No files matched your search

+55
View File
@@ -0,0 +1,55 @@
/*
* Copyright (C) 2023 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.
*/
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_app {
name: "DeviceSettingsNX",
manifest: "AndroidManifest.xml",
srcs: [
"src/**/*.java",
],
resource_dirs: [
"res",
],
overrides: ["DeviceSettings"],
platform_apis: true,
certificate: "platform",
required: ["privapp-permissions-lineage-displaysettings-nx.xml"],
optimize: {
proguard_flags_files: ["proguard.flags"],
},
privileged: true,
static_libs: [
"androidx.preference_preference",
"androidx.appcompat_appcompat",
"androidx.legacy_legacy-preference-v14",
"androidx.leanback_leanback-preference",
"androidx.leanback_leanback",
"org.lineageos.settings.resources",
"org.lineageos.platform.internal",
"vendor.nvidia.hardware.graphics.display-V1.0-java",
],
}
prebuilt_etc {
name: "privapp-permissions-lineage-displaysettings-nx.xml",
sub_dir: "permissions",
src: "permissions/privapp-permissions-lineage-displaysettings.xml",
filename_from_src: false,
}
-41
View File
@@ -1,41 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_CERTIFICATE := platform
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PACKAGE_NAME := DeviceSettingsNX
LOCAL_OVERRIDES_PACKAGES := DeviceSettings
LOCAL_MODULE_TAGS := optional
LOCAL_USE_AAPT2 := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.core_core \
androidx.preference_preference \
androidx.leanback_leanback \
androidx.leanback_leanback-preference
LOCAL_STATIC_JAVA_LIBRARIES := \
org.lineageos.platform.internal \
vendor.nvidia.hardware.graphics.display-V1.0-java
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res \
$(TOP)/packages/resources/devicesettings/res
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_REQUIRED_MODULES := \
privapp-permissions-lineage-displaysettings-nx.xml
include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
LOCAL_MODULE := privapp-permissions-lineage-displaysettings-nx.xml
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := permissions/privapp-permissions-lineage-displaysettings.xml
LOCAL_MODULE_RELATIVE_PATH := permissions
include $(BUILD_PREBUILT)
+1 -1
View File
@@ -17,7 +17,7 @@
<protected-broadcast android:name="com.lineage.devicesettings.UPDATE_POWER" />
<application
android:label="@string/device_settings_app_name"
android:label="@string/display_panel_title"
android:icon="@mipmap/ic_launcher"
android:banner="@mipmap/ic_banner"
android:persistent="true">
-43
View File
@@ -16,49 +16,6 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<style name="Theme.Main" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="dialogPreferenceStyle">@style/Theme.Main.DialogPreferenceStyle</item>
<item name="preferenceCategoryStyle">@style/Theme.Main.PreferenceCategoryStyle</item>
<item name="preferenceFragmentStyle">@style/Theme.Main.PreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Theme.Main.PreferenceStyle</item>
<item name="preferenceTheme">@style/Theme.Main.PreferenceTheme</item>
<item name="switchPreferenceStyle">@style/Theme.Main.SwitchPreferenceStyle</item>
<item name="android:colorPrimary">#3E0E2F</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
</style>
<style name="Theme.Main.DialogPreferenceStyle" parent="@*android:style/Preference.DeviceDefault.DialogPreference">
<item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item>
<item name="singleLineTitle">false</item>
<item name="android:iconSpaceReserved">true</item>
</style>
<style name="Theme.Main.PreferenceCategoryStyle" parent="@*android:style/Preference.DeviceDefault.Category">
<item name="allowDividerAbove">true</item>
<item name="allowDividerBelow">true</item>
<item name="android:layout">@layout/preference_category_material_settings</item>
</style>
<style name="Theme.Main.PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
<item name="allowDividerAfterLastItem">false</item>
</style>
<style name="Theme.Main.PreferenceStyle" parent="@*android:style/Preference.DeviceDefault">
<item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item>
<item name="singleLineTitle">false</item>
<item name="android:layout">@layout/preference_material_settings</item>
</style>
<style name="Theme.Main.PreferenceTheme">
</style>
<style name="Theme.Main.SwitchPreferenceStyle" parent="@style/Theme.Main.PreferenceStyle">
<item name="widgetLayout">@*android:layout/preference_widget_switch</item>
</style>
<style name="LeanbackPreferences" parent="Theme.Leanback">
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Leanback</item>
<item name="android:windowIsTranslucent">true</item>