Snap for 7542710 from 1d495b24800dd0d10332149c5dcae7480b18498d to sc-release
Change-Id: I08f5e080c40d3cbe88d537ecca2f6f0b9cad06c4
diff --git a/go/quickstep/res/values-si/strings.xml b/go/quickstep/res/values-si/strings.xml
index 9a18629..cd6060c 100644
--- a/go/quickstep/res/values-si/strings.xml
+++ b/go/quickstep/res/values-si/strings.xml
@@ -5,24 +5,15 @@
<string name="action_listen" msgid="2370304050784689486">"සවන් දෙන්න"</string>
<string name="action_translate" msgid="8028378961867277746">"පරිවර්තනය කරන්න"</string>
<string name="action_search" msgid="6269564710943755464">"Lens"</string>
- <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
- <skip />
- <!-- no translation found for dialog_cancel (6464336969134856366) -->
- <skip />
- <!-- no translation found for dialog_settings (6564397136021186148) -->
- <skip />
+ <string name="dialog_acknowledge" msgid="2804025517675853172">"තේරුණා"</string>
+ <string name="dialog_cancel" msgid="6464336969134856366">"අවලංගු කරන්න"</string>
+ <string name="dialog_settings" msgid="6564397136021186148">"සැකසීම්"</string>
<string name="niu_actions_confirmation_title" msgid="3863451714863526143">"තිරය මත පෙළ පරිවර්තනය කරන්න හෝ එයට සවන් දෙන්න"</string>
<string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ඔබගේ තිරයේ ඇති පෙළ, වෙබ් ලිපින සහ තිර රූ වැනි තොරතුරු Google සමඟ බෙදා ගත හැකිය.\n\nඔබ බෙදා ගන්නා තොරතුරු වෙනස් කිරීමට, "<b>"සැකසීම් > යෙදුම් > පෙරනිමි යෙදුම් > ඩිජිටල් සහායක යෙදුම"</b>" වෙත යන්න."</string>
- <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
- <skip />
- <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
- <skip />
- <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
- <skip />
- <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
- <skip />
- <!-- no translation found for tooltip_listen (7634466447860989102) -->
- <skip />
- <!-- no translation found for tooltip_translate (4184845868901542567) -->
- <skip />
+ <string name="assistant_not_selected_title" msgid="5017072974603345228">"මෙම විශේෂාංගය භාවිත කිරීමට සහායකයකු තෝරන්න"</string>
+ <string name="assistant_not_selected_text" msgid="3244613673884359276">"ඔබගේ තිරයේ පෙළ සවන් දීමට හෝ පරිවර්තනය කිරීමට, සැකසීම්වල ඩිජිටල් සහායක යෙදුමක් තෝරන්න"</string>
+ <string name="assistant_not_supported_title" msgid="1675788067597484142">"මෙම විශේෂාංගය භාවිත කිරීමට ඔබගේ සහායක වෙනස් කරන්න"</string>
+ <string name="assistant_not_supported_text" msgid="1708031078549268884">"ඔබගේ තිරයේ පෙළට සවන් දීමට හෝ පරිවර්තනය කිරීමට, සැකසීම් තුළ ඔබගේ ඩිජිටල් සහායක යෙදුම වෙනස් කරන්න"</string>
+ <string name="tooltip_listen" msgid="7634466447860989102">"මෙම තිරයේ පෙළට සවන් දීමට මෙහි තට්ටු කරන්න"</string>
+ <string name="tooltip_translate" msgid="4184845868901542567">"මෙම තිරයේ පෙළ පරිවර්තනය කිරීමට මෙහි තට්ටු කරන්න"</string>
</resources>
diff --git a/go/quickstep/res/values-sk/strings.xml b/go/quickstep/res/values-sk/strings.xml
index cea591a..880d8ad 100644
--- a/go/quickstep/res/values-sk/strings.xml
+++ b/go/quickstep/res/values-sk/strings.xml
@@ -5,24 +5,15 @@
<string name="action_listen" msgid="2370304050784689486">"Počúvať"</string>
<string name="action_translate" msgid="8028378961867277746">"Preložiť"</string>
<string name="action_search" msgid="6269564710943755464">"Lens"</string>
- <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
- <skip />
- <!-- no translation found for dialog_cancel (6464336969134856366) -->
- <skip />
- <!-- no translation found for dialog_settings (6564397136021186148) -->
- <skip />
+ <string name="dialog_acknowledge" msgid="2804025517675853172">"DOBRE"</string>
+ <string name="dialog_cancel" msgid="6464336969134856366">"ZRUŠIŤ"</string>
+ <string name="dialog_settings" msgid="6564397136021186148">"NASTAVENIA"</string>
<string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prekladajte alebo počúvajte text na obrazovke"</string>
<string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Údaje, napríklad text na obrazovke, webové adresy a snímky obrazovky, môžu byť zdieľané s Googlom.\n\nAk chcete zmeniť, ktoré údaje zdieľate, prejdite do sekcie "<b>"Nastavenia > Aplikácie > Predvolené aplikácie > Digitálny asistent"</b>"."</string>
- <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
- <skip />
- <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
- <skip />
- <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
- <skip />
- <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
- <skip />
- <!-- no translation found for tooltip_listen (7634466447860989102) -->
- <skip />
- <!-- no translation found for tooltip_translate (4184845868901542567) -->
- <skip />
+ <string name="assistant_not_selected_title" msgid="5017072974603345228">"Ak chcete používať túto funkciu, vyberte asistenta"</string>
+ <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ak si chcete vypočuť alebo nechať preložiť text na obrazovke, vyberte v Nastaveniach aplikáciu digitálneho asistenta"</string>
+ <string name="assistant_not_supported_title" msgid="1675788067597484142">"Ak chcete použígvať túto funkciu, zmeňte svojho asistenta"</string>
+ <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ak si chcete vypočuť alebo nechať preložiť text na obrazovke, zmeňte v Nastaveniach aplikáciu digitálneho asistenta"</string>
+ <string name="tooltip_listen" msgid="7634466447860989102">"Klepnutím tu si vypočujte text na tejto obrazovke"</string>
+ <string name="tooltip_translate" msgid="4184845868901542567">"Klepnutím tu si nechajte preložiť text na tejto obrazovke"</string>
</resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
index 3d71b56..5228cfe 100644
--- a/go/quickstep/res/values-uz/strings.xml
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -5,24 +5,15 @@
<string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
<string name="action_translate" msgid="8028378961867277746">"Tarjima"</string>
<string name="action_search" msgid="6269564710943755464">"Lens"</string>
- <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
- <skip />
- <!-- no translation found for dialog_cancel (6464336969134856366) -->
- <skip />
- <!-- no translation found for dialog_settings (6564397136021186148) -->
- <skip />
+ <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+ <string name="dialog_cancel" msgid="6464336969134856366">"BEKOR QILISH"</string>
+ <string name="dialog_settings" msgid="6564397136021186148">"SOZLAMALAR"</string>
<string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandagi matnni tarjima qilish yoki tinglash"</string>
<string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekraningizdagi matn, veb-manzillar va skrinshot kabilar Googlega yuborilishi mumkin.\n\nQanday maʼlumotlarni ulashishni tanlash uchun "<b>"Sozlamalar > Ilovalar > Standart ilovalar > Raqamli assistent"</b>" ilovasini oching."</string>
- <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
- <skip />
- <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
- <skip />
- <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
- <skip />
- <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
- <skip />
- <!-- no translation found for tooltip_listen (7634466447860989102) -->
- <skip />
- <!-- no translation found for tooltip_translate (4184845868901542567) -->
- <skip />
+ <string name="assistant_not_selected_title" msgid="5017072974603345228">"Bu funksiyadan foydalanish uchun assistentni tanlang"</string>
+ <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ekrandagi matnni eshittirish yoki tarjima qilish uchun Sozlamalar orqali raqamli assistent ilovasini tanlang"</string>
+ <string name="assistant_not_supported_title" msgid="1675788067597484142">"Bu funksiyadan foydalanish uchun assistentni almashtiring"</string>
+ <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ekrandagi matnni eshittirish yoki tarjima qilish uchun Sozlamalar orqali raqamli assistent ilovasini almashtiring"</string>
+ <string name="tooltip_listen" msgid="7634466447860989102">"Ekrandagi matnni eshittirish uchun bosing"</string>
+ <string name="tooltip_translate" msgid="4184845868901542567">"Ekrandagi matnni tarjima qilish uchun bosing"</string>
</resources>
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 2a3d154..382b8fc 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="@dimen/work_card_padding_horizontal"
- android:paddingVertical="@dimen/work_card_padding_vertical"
+ android:paddingVertical="@dimen/work_card_padding_horizontal"
android:background="@drawable/work_card"
android:layout_gravity="center_horizontal"
android:gravity="center"
@@ -36,14 +36,14 @@
android:id="@+id/work_apps_paused_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/work_card_padding_vertical"
+ android:layout_marginBottom="@dimen/work_card_padding_horizontal"
android:text="@string/work_profile_edu_work_apps"
android:textAlignment="center"
android:textSize="20sp" />
<Button
- android:layout_width="wrap_content"
- android:layout_height="@dimen/rounded_button_height"
+ android:layout_width="match_parent"
+ android:layout_height="52dp"
android:id="@+id/action_btn"
android:textColor="?attr/workProfileOverlayTextColor"
android:text="@string/work_profile_edu_accept"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f03e043..ee2ceb1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,7 +122,6 @@
<dimen name="work_fab_height">56dp</dimen>
<dimen name="work_fab_radius">28dp</dimen>
<dimen name="work_card_padding_horizontal">24dp</dimen>
- <dimen name="work_card_padding_vertical">32dp</dimen>
<dimen name="work_fab_margin">16dp</dimen>
<dimen name="work_profile_footer_padding">20dp</dimen>
<dimen name="work_profile_footer_text_size">16sp</dimen>
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index c3edcce..6605509 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -177,6 +177,7 @@
mWidgetImageContainer.removeView(mAppWidgetHostViewPreview);
}
mAppWidgetHostViewPreview = null;
+ mItem = null;
}
public void setSourceContainer(int sourceContainer) {
diff --git a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
index 00b1cdd..7a5cf2c 100644
--- a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
+++ b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
@@ -62,12 +62,17 @@
ParcelFileDescriptor output =
automation.executeShellCommand("screenrecord " + outputFile);
String screenRecordPid = device.executeShellCommand("pidof screenrecord");
+ boolean success = false;
try {
base.evaluate();
+ success = true;
} finally {
device.executeShellCommand("kill -INT " + screenRecordPid);
Log.e(TAG, "Screenrecord captured at: " + outputFile);
output.close();
+ if (success) {
+ automation.executeShellCommand("rm " + outputFile);
+ }
}
}
};
@@ -78,5 +83,6 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
- public @interface ScreenRecord { }
+ public @interface ScreenRecord {
+ }
}