Skip to content

Commit e4c1045

Browse files
committed
Customizations: Make it aosp build system compatible
Signed-off-by: IacobIonut01 <[email protected]>
1 parent 8b5e221 commit e4c1045

32 files changed

+407
-408
lines changed

.idea/gradle.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Android.bp

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
2+
//
3+
// Build rule for Customizations dependencies lib.
4+
//
5+
package {
6+
default_applicable_licenses: ["Android-Apache-2.0"],
7+
}
8+
9+
android_library_import {
10+
name: "apibypass",
11+
aars: ["static_libs/hiddenapibypass-4.3.aar"],
12+
sdk_version: "current",
13+
jetifier: true,
14+
}
15+
16+
android_library_import {
17+
name: "modernpreferences",
18+
static_libs: [
19+
"androidx-constraintlayout_constraintlayout",
20+
],
21+
aars: ["app/libs/modernpreferences.aar"],
22+
sdk_version: "current",
23+
jetifier: true,
24+
}
25+
26+
java_import {
27+
name: "customizations_libs",
28+
jars: [
29+
"app/libs/WallpaperSharedLib.jar",
30+
"app/libs/SystemUISharedLib.jar",
31+
],
32+
jetifier: true,
33+
}
34+
35+
android_library {
36+
name: "settingslib",
37+
38+
static_libs: [
39+
"androidx.appcompat_appcompat",
40+
"androidx.core_core-ktx",
41+
"androidx.preference_preference",
42+
"com.google.android.material_material",
43+
],
44+
45+
optimize: {
46+
enabled: false,
47+
},
48+
49+
kotlincflags: ["-Xjvm-default=enable"],
50+
51+
sdk_version: "current",
52+
53+
resource_dirs: ["SettingsLibTheme/src/main/res"],
54+
55+
manifest: "SettingsLibTheme/src/main/AndroidManifest.xml",
56+
}
57+
58+
prebuilt_etc {
59+
name: "privapp_whitelist_com.dot.customizations.xml",
60+
src: "privapp_whitelist_com.dot.customizations.xml",
61+
system_ext_specific: true,
62+
sub_dir: "permissions",
63+
}
64+
65+
android_app {
66+
name: "Customizations",
67+
68+
srcs: [
69+
"app/src/main/java/**/*.java",
70+
"app/src/main/java/**/*.kt",
71+
],
72+
73+
resource_dirs: ["app/src/main/res"],
74+
75+
static_libs: [
76+
"settingslib",
77+
"customizations_libs",
78+
"androidx.appcompat_appcompat",
79+
"androidx.cardview_cardview",
80+
"androidx.activity_activity-ktx",
81+
"androidx.fragment_fragment-ktx",
82+
"androidx.biometric_biometric",
83+
"androidx-constraintlayout_constraintlayout",
84+
"androidx.exifinterface_exifinterface",
85+
"androidx.lifecycle_lifecycle-runtime-ktx",
86+
"androidx.recyclerview_recyclerview",
87+
"androidx.slice_slice-view",
88+
"androidx.viewpager2_viewpager2",
89+
"com.google.android.material_material",
90+
"glide-prebuilt",
91+
"kotlinx-coroutines-android",
92+
"kotlinx-coroutines-core",
93+
"libbackup",
94+
"subsampling-scale-image-view",
95+
"SystemUI-statsd",
96+
"guava",
97+
"volley",
98+
"modernpreferences",
99+
"libWallpaperPicker",
100+
"apibypass", // Needed for keeping gradle compatibility
101+
"colorkt",
102+
],
103+
104+
use_embedded_native_libs: true,
105+
106+
optimize: {
107+
enabled: false,
108+
},
109+
kotlincflags: ["-Xjvm-default=enable"],
110+
111+
certificate: "platform",
112+
113+
privileged: true,
114+
system_ext_specific: true,
115+
platform_apis: true,
116+
117+
manifest: "app/src/main/AndroidManifest.xml",
118+
119+
overrides: ["ThemePicker", "WallpaperPicker", "WallpaperPicker2", "WallpaperCropper", "WallpaperPickerGoogleRelease"],
120+
121+
required: ["privapp_whitelist_com.dot.customizations.xml"],
122+
}

SettingsLibTheme/src/main/res/values/dimens.xml

+6
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,10 @@
2222
<dimen name="app_icon_min_width">52dp</dimen>
2323
<dimen name="settingslib_preferred_minimum_touch_target">48dp</dimen>
2424
<dimen name="settingslib_dialogCornerRadius">28dp</dimen>
25+
26+
<!-- Collapsing toolbar layout dimensions -->
27+
<dimen name="settingslib_toolbar_layout_height">179dp</dimen>
28+
<dimen name="settingslib_scrim_visible_height_trigger">137dp</dimen>
29+
<dimen name="expanded_title_margin_start">24dp</dimen>
30+
<dimen name="expanded_title_margin_end">24dp</dimen>
2531
</resources>

SettingsLibTheme/src/main/res/values/styles.xml

+11
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,15 @@
3939
<item name="android:progressDrawable">@drawable/settingslib_progress_horizontal</item>
4040
<item name="android:scaleY">0.5</item>
4141
</style>
42+
43+
<style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
44+
<item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
45+
<item name="android:textSize">20dp</item>
46+
<item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>
47+
</style>
48+
49+
<style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">
50+
<item name="android:textSize">36dp</item>
51+
<item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>
52+
</style>
4253
</resources>

SettingsLibTheme/src/main/res/values/themes.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<item name="alertDialogTheme">@style/Theme.AlertDialog.SettingsLib</item>
4343
</style>
4444

45-
<style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.Material3.DayNight.Dialog.Alert">
45+
<style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.MaterialComponents.DayNight.Dialog.Alert">
4646
<item name="colorAccent">@color/settingslib_dialog_accent</item>
4747
<item name="android:colorAccent">@color/settingslib_dialog_accent</item>
4848
<item name="android:colorControlHighlight">@color/settingslib_dialog_accent</item>
@@ -58,4 +58,11 @@
5858
<item name="android:dialogCornerRadius">@dimen/settingslib_dialogCornerRadius</item>
5959
</style>
6060

61+
<style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">
62+
<item name="elevationOverlayEnabled">true</item>
63+
<item name="elevationOverlayColor">?attr/colorPrimary</item>
64+
<item name="colorPrimary">@color/settingslib_primary_device_default_settings_light</item>
65+
<item name="colorAccent">@color/settingslib_accent_device_default_light</item>
66+
</style>
67+
6168
</resources>

SettingsLibToolbar/.gitignore

-1
This file was deleted.

SettingsLibToolbar/build.gradle

-39
This file was deleted.

SettingsLibToolbar/consumer-rules.pro

Whitespace-only changes.

SettingsLibToolbar/proguard-rules.pro

-21
This file was deleted.

SettingsLibToolbar/src/main/AndroidManifest.xml

-2
This file was deleted.

SettingsLibToolbar/src/main/res/values/dimens.xml

-23
This file was deleted.

SettingsLibToolbar/src/main/res/values/styles.xml

-28
This file was deleted.

SettingsLibToolbar/src/main/res/values/themes.xml

-24
This file was deleted.

app/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,13 @@ android {
4545
kotlinOptions {
4646
jvmTarget = '11'
4747
}
48-
buildFeatures {
49-
viewBinding true
50-
}
5148
}
5249

5350
dependencies {
5451

5552
compileOnly fileTree(dir: 'system_libs/', include: ['*.jar'])
5653
implementation fileTree(dir: 'libs/', include: ['*.jar', '*.aar'])
5754

58-
59-
implementation project(":SettingsLibToolbar")
6055
implementation project(":SettingsLibTheme")
6156

6257
implementation 'androidx.core:core-ktx:1.8.0'

app/src/main/AndroidManifest.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
android:requiredForAllUsers="true"
6363
android:restoreAnyVersion="true"
6464
android:supportsRtl="true"
65-
android:theme="@style/CustomizationTheme">
65+
android:theme="@style/CustomizationTheme"
66+
tools:replace="android:appComponentFactory"
67+
android:appComponentFactory="androidx.core.app.CoreComponentFactory">
6668
<activity
6769
android:name=".picker.CustomizationPickerActivity"
6870
android:exported="true"

app/src/main/java/com/dot/customizations/AppGlideModule.kt

-7
This file was deleted.

0 commit comments

Comments
 (0)