Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: Iec609244af739a068640c476e984e9fc9f9097d9
Change-Id: I1ca7bedb2541620a5c09785dbe6af73c185ed95c

6 files changed, 15 insertions, 13 deletions

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index eb594ab..5a78977 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -25,14 +25,14 @@
     <string name="live_wallpaper_preview_title" msgid="908570871421455329">"ቀጥታ የሚተላለፍ ልጣፍ ቅድመ ዕይታ"</string>
     <string name="configure_wallpaper" msgid="4308477548538487192">"ቅንብሮች…"</string>
     <string name="delete_live_wallpaper" msgid="2401799265848069389">"ሰርዝ"</string>
-    <string name="preview" msgid="1067744492020029129">"ቅድመ-እይታ"</string>
+    <string name="preview" msgid="1067744492020029129">"ቅድመ-ዕይታ"</string>
     <string name="wallpaper_instructions" msgid="6112878742140691445">"ልጣፍ አዘጋጅ"</string>
     <string name="live_wallpaper_empty" msgid="8057319062274870589">"የቀጥታ ስርጭት ልጣፍ የለም።"</string>
     <string name="set_live_wallpaper" msgid="764007409845174475">"ልጣፍ አዘጋጅ"</string>
     <string name="wallpaper_title_and_author" msgid="7606029050779779421">"<xliff:g id="TITLE">%1$s</xliff:g> በ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
     <string name="live_wallpaper_loading" msgid="7218845906181560315">"ቀጥታ የሚተላለፍ ልጣፍ በመስቀል ላይ..."</string>
-    <string name="which_wallpaper_option_home_screen" msgid="3323619298489943624">"መነሻ ገጽ"</string>
-    <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="1650093303691767601">"መነሻ ገጽ እና ማያ ገጽ ቁልፍ"</string>
+    <string name="which_wallpaper_option_home_screen" msgid="3323619298489943624">"መነሻ ገፅ"</string>
+    <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="1650093303691767601">"መነሻ ገፅ እና ማያ ገፅ ቁልፍ"</string>
     <string name="explore_further" msgid="489032063223099244">"አስስ"</string>
     <string name="tab_info" msgid="5501369870701932475">"መረጃ"</string>
     <string name="tab_customize" msgid="9007237541087328909">"ያብጁ"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 023654f..dab7b2c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -26,9 +26,9 @@
     <string name="configure_wallpaper" msgid="4308477548538487192">"Ajustes…"</string>
     <string name="delete_live_wallpaper" msgid="2401799265848069389">"Eliminar"</string>
     <string name="preview" msgid="1067744492020029129">"Vista previa"</string>
-    <string name="wallpaper_instructions" msgid="6112878742140691445">"Establecer fondo de pantalla"</string>
+    <string name="wallpaper_instructions" msgid="6112878742140691445">"Establecer fondo"</string>
     <string name="live_wallpaper_empty" msgid="8057319062274870589">"No hay ningún fondo animado."</string>
-    <string name="set_live_wallpaper" msgid="764007409845174475">"Establecer fondo de pantalla"</string>
+    <string name="set_live_wallpaper" msgid="764007409845174475">"Establecer fondo"</string>
     <string name="wallpaper_title_and_author" msgid="7606029050779779421">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
     <string name="live_wallpaper_loading" msgid="7218845906181560315">"Cargando fondo animado…"</string>
     <string name="which_wallpaper_option_home_screen" msgid="3323619298489943624">"Pantalla de inicio"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a4d87f6..88399be 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -32,7 +32,7 @@
     <string name="wallpaper_title_and_author" msgid="7606029050779779421">"<xliff:g id="TITLE">%1$s</xliff:g> od autora/ice: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
     <string name="live_wallpaper_loading" msgid="7218845906181560315">"Učitavanje animirane pozadine…"</string>
     <string name="which_wallpaper_option_home_screen" msgid="3323619298489943624">"Početni zaslon"</string>
-    <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="1650093303691767601">"Početni zaslon i zaključan zaslon"</string>
+    <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="1650093303691767601">"Početni zaslon i zaključani zaslon"</string>
     <string name="explore_further" msgid="489032063223099244">"Istraži"</string>
     <string name="tab_info" msgid="5501369870701932475">"Informacije"</string>
     <string name="tab_customize" msgid="9007237541087328909">"Prilagodi"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 4641f8d..30214fb 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -26,9 +26,9 @@
     <string name="configure_wallpaper" msgid="4308477548538487192">"Tetapan..."</string>
     <string name="delete_live_wallpaper" msgid="2401799265848069389">"Padam"</string>
     <string name="preview" msgid="1067744492020029129">"Pratonton"</string>
-    <string name="wallpaper_instructions" msgid="6112878742140691445">"Tetapkan kertas dinding"</string>
+    <string name="wallpaper_instructions" msgid="6112878742140691445">"Tetapkan hiasan latar"</string>
     <string name="live_wallpaper_empty" msgid="8057319062274870589">"Tiada kertas dinding langsung."</string>
-    <string name="set_live_wallpaper" msgid="764007409845174475">"Tetapkan kertas dinding"</string>
+    <string name="set_live_wallpaper" msgid="764007409845174475">"Tetapkan hiasan latar"</string>
     <string name="wallpaper_title_and_author" msgid="7606029050779779421">"<xliff:g id="TITLE">%1$s</xliff:g> oleh <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
     <string name="live_wallpaper_loading" msgid="7218845906181560315">"Memuatkan kertas dinding hidup..."</string>
     <string name="which_wallpaper_option_home_screen" msgid="3323619298489943624">"Skrin utama"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index e993645..234df60 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -26,9 +26,9 @@
     <string name="configure_wallpaper" msgid="4308477548538487192">"ସେଟିଂସ..."</string>
     <string name="delete_live_wallpaper" msgid="2401799265848069389">"ଡିଲିଟ୍ କରନ୍ତୁ"</string>
     <string name="preview" msgid="1067744492020029129">"ପୂର୍ବାବଲୋକନ କରନ୍ତୁ"</string>
-    <string name="wallpaper_instructions" msgid="6112878742140691445">"ୱାଲପେପର୍‍ ସେଟ୍ କରନ୍ତୁ"</string>
+    <string name="wallpaper_instructions" msgid="6112878742140691445">"ୱାଲପେପର ସେଟ କରନ୍ତୁ"</string>
     <string name="live_wallpaper_empty" msgid="8057319062274870589">"କୌଣସି ଲାଇଭ୍‌ ୱାଲପେପର୍‌ ନାହିଁ"</string>
-    <string name="set_live_wallpaper" msgid="764007409845174475">"ୱାଲପେପର୍‍ ସେଟ୍ କରନ୍ତୁ"</string>
+    <string name="set_live_wallpaper" msgid="764007409845174475">"ୱାଲପେପର ସେଟ କରନ୍ତୁ"</string>
     <string name="wallpaper_title_and_author" msgid="7606029050779779421">"<xliff:g id="TITLE">%1$s</xliff:g>ଙ୍କ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
     <string name="live_wallpaper_loading" msgid="7218845906181560315">"ଲାଇଭ୍‌ ୱାଲପେପରଗୁଡ଼ିକୁ ଲୋଡ୍‌ କରାଯାଉଛି..."</string>
     <string name="which_wallpaper_option_home_screen" msgid="3323619298489943624">"ହୋମ ସ୍କ୍ରିନ"</string>
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index 4f23b88..5fed5c5 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -154,7 +154,7 @@ public class LiveWallpaperPreview extends Activity {
         toolbar.setNavigationIcon(backArrow);
 
         mWallpaperManager = WallpaperManager.getInstance(this);
-        mWallpaperConnection = new WallpaperConnection(mWallpaperIntent);
+        mWallpaperConnection = new WallpaperConnection(mWallpaperIntent, info);
         getWindow().getDecorView().post(new Runnable() {
             public void run() {
                 if (!mWallpaperConnection.connect()) {
@@ -593,9 +593,11 @@ public class LiveWallpaperPreview extends Activity {
         boolean mConnected;
         boolean mIsVisible;
         boolean mIsEngineVisible;
+        WallpaperInfo mInfo;
 
-        WallpaperConnection(Intent intent) {
+        WallpaperConnection(Intent intent, WallpaperInfo info) {
             mIntent = intent;
+            mInfo = info;
         }
 
         public boolean connect() {
@@ -645,7 +647,7 @@ public class LiveWallpaperPreview extends Activity {
                     mService.attach(this, root.getWindowToken(),
                             LayoutParams.TYPE_APPLICATION_MEDIA, true, root.getWidth(),
                             root.getHeight(), new Rect(0, 0, 0, 0), displayId,
-                            WallpaperManager.FLAG_SYSTEM);
+                            WallpaperManager.FLAG_SYSTEM, mInfo);
                 } catch (RemoteException e) {
                     Log.w(LOG_TAG, "Failed attaching wallpaper; clearing", e);
                 }