Snap for 7272189 from 46b4f42b049d51217e22bac3c6a4360336f306cc to mainline-media-releaseandroid-mainline-11.0.0_r39android11-mainline-media-release

Change-Id: I708eb149216d792cc975e60d493cb4d5e2511b5d

7 files changed, 12 insertions, 13 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 29d0ccece..c6552fd6d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -46,7 +46,7 @@
     <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-    <uses-sdk android:minSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 
     <application android:name="com.android.cellbroadcastreceiver.CellBroadcastReceiverApp"
             android:label="@string/app_label"
diff --git a/AndroidManifest_Platform.xml b/AndroidManifest_Platform.xml
index 107fa1eb6..8d39f804e 100644
--- a/AndroidManifest_Platform.xml
+++ b/AndroidManifest_Platform.xml
@@ -38,7 +38,7 @@
   <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-  <uses-sdk android:minSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 
   <application android:name="CellBroadcastReceiverApp"
       android:label="@string/app_label"
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
index 1f1f74133..adc9daa92 100644
--- a/apex/AndroidManifest.xml
+++ b/apex/AndroidManifest.xml
@@ -18,11 +18,8 @@
     package="com.android.cellbroadcast">
     <!-- APEX does not have classes.dex -->
     <application android:hasCode="false" />
-    <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->
-    <!-- Setting maxSdk to lock the module to R. minSdk is auto-set by build system -->
-    <!--uses-sdk
-        android:maxSdkVersion="30"
+    <!-- set target SDK to 30 until S sdk is finalized, see b/182409562 -->
+    <uses-sdk
         android:targetSdkVersion="30"
     />
-    -->
 </manifest>
diff --git a/res/layout/cell_broadcast_alert.xml b/res/layout/cell_broadcast_alert.xml
index dfb45b353..bff3c7b9e 100644
--- a/res/layout/cell_broadcast_alert.xml
+++ b/res/layout/cell_broadcast_alert.xml
@@ -113,11 +113,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:gravity="end"
+            android:gravity="center_horizontal"
             android:measureWithLargestChild="true">
             <Button android:id="@+id/dismissButton"
                 android:layout_width="wrap_content"
                 android:layout_weight="0"
+                android:paddingLeft="100dp"
+                android:paddingRight="100dp"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle"
                 android:text="@string/button_dismiss"
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 22fc0f73b..af7398a87 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -35,7 +35,7 @@
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Poistetaanko tämä lähetys?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Poista kaikki vastaanotetut lähetysviestit?"</string>
     <string name="button_delete" msgid="4672451757925194350">"Poista"</string>
-    <string name="button_cancel" msgid="7479958360523246140">"Peruuta"</string>
+    <string name="button_cancel" msgid="7479958360523246140">"Peru"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"Maanjäristysvaroitus"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"Tsunamivaroitus"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Maanjäristys- ja tsunamivaroitus"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7004bf41f..d40b5ee96 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
+    <string name="app_label" msgid="2008319089248760277">"Kritinės padėties įspėjimai"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
     <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 89b5b4eed..c2299faa9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"आपत्‌कालीन वायरलेस सतर्कताहरू"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"आपत्‌कालीन वायरलेस सतर्कताहरू"</string>
+    <string name="app_label" msgid="2008319089248760277">"आपत्‌कालीन अवस्थामा वायरलेस एलर्ट"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"आपत्‌कालीन अवस्थामा वायरलेस एलर्ट"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"आपत्‌कालीन वायरलेस अलर्टहरू"</string>
     <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"आपत्‌कालीन वायरलेस अलर्टहरू"</string>
     <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"आपत्‌कालीन वायरलेस अलर्टहरू"</string>
@@ -134,7 +134,7 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"नयाँ सावधानीहरू"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"पहिलो सतर्कता देखाएपछि बाहिरिने संवाद देखाउनुहोस् (राष्ट्रपतीय चेतावनीबाहेक)।"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"अप्ट-आउट सम्बाद देखाउनुहोस्"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"तपाईं हाल आपत्‌कालीन वायरलेस सतर्कताहरू प्राप्त गर्दै हुनुहुन्छ। तपाईं आपत्‌कालीन वायरलेस सतर्कताहरू प्राप्त गरिरहन चाहनुहुन्छ?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"तपाईं हाल आपत्‌कालीन अवस्थामा वायरलेस एलर्ट प्राप्त गर्दै हुनुहुन्छ। तपाईं आपत्‌कालीन अवस्थामा वायरलेस एलर्ट प्राप्त गरिरहन चाहनुहुन्छ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"हो"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"होइन"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"आपत्‌कालीन अलर्टको इतिहास"</string>