commit a95672baf1db2e49d410fc7a353f6eda75856af6
author Colin Cross <ccross@android.com> Sat Aug 21 01:39:08 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Aug 21 01:39:08 2021 +0000
tree d7af4446860e683009d8ac3cb161e21f48952dae
parent 2a2cc230fe68b6c4166d21bf323c41f51ae8ce1f
parent 24ad325b1b780ebd6d5a649a88410a5769943f85

Remove SettingsLib from Telecom am: 24ad325b1b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1804616

Change-Id: I6997f428bb759866038c46680b46be1f64698fc9

Android.bp

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 {

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 01bb88c..8d6e084 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -375,4 +375,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>