Remove SettingsLib from Telecom
SettingsLib is no longer used, and pulls in androidx which causes
issues with unexpectected ContentProviders. Remove it, and add
androidx.annotation_annotation and a definition of strings/cancel
instead.
Test: m Telecom
Change-Id: Iadd9827ec569a3dcf5b812aa4bf4377f74603e02
diff --git a/Android.bp b/Android.bp
index b7eb450..88cffb8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,9 @@
":Telecom-srcs",
"proto/**/*.proto",
],
+ static_libs: [
+ "androidx.annotation_annotation",
+ ],
resource_dirs: ["res"],
proto: {
type: "nano",
@@ -37,7 +40,6 @@
optimize: {
proguard_flags_files: ["proguard.flags"],
},
- defaults: ["SettingsLibDefaults"],
}
android_test {
diff --git a/res/values/strings.xml b/res/values/strings.xml
index df08d7c..9b49515 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -373,4 +373,6 @@
blocking functionality (for test purposes).
DO NOT TRANSLATE -->
<string name="developer_enhanced_call_blocking" translatable="false">Enhanced Call Blocking</string>
+ <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+ <string name="cancel">Cancel</string>
</resources>
