Merge "Adding compat implementation for the new WallpaperManager APIs for color extraction" into ub-launcher3-dorval-polish
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 31167e9..bd966c7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -77,7 +77,7 @@
<string name="allow_rotation_title" msgid="7728578836261442095">"Laat toe dat tuisskerm gedraai word"</string>
<string name="allow_rotation_desc" msgid="8662546029078692509">"Wanneer foon gedraai word"</string>
<string name="allow_rotation_blocked_desc" msgid="3212602545192996253">"Huidige vertooninstelling laat nie rotasie toe nie"</string>
- <string name="icon_badging_title" msgid="4418239350706629417">"Ikoon-kentekengewing"</string>
+ <string name="icon_badging_title" msgid="4418239350706629417">"Ikoon-kentekentoekenning"</string>
<string name="icon_badging_desc_on" msgid="6022379097717134764">"Aan vir alle programme"</string>
<string name="icon_badging_desc_off" msgid="1574640601251590211">"Af vir alle programme"</string>
<string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Voeg ikoon by tuisskerm"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 52a5df4..7af2ef9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -77,9 +77,9 @@
<string name="allow_rotation_title" msgid="7728578836261442095">"Permet la rotació de la pantalla d\'inici"</string>
<string name="allow_rotation_desc" msgid="8662546029078692509">"En girar el telèfon"</string>
<string name="allow_rotation_blocked_desc" msgid="3212602545192996253">"La configuració actual de la pantalla no permet la rotació"</string>
- <string name="icon_badging_title" msgid="4418239350706629417">"Símbols d\'icona"</string>
- <string name="icon_badging_desc_on" msgid="6022379097717134764">"Activats per a totes les aplicacions"</string>
- <string name="icon_badging_desc_off" msgid="1574640601251590211">"Desactivats per a totes les aplicacions"</string>
+ <string name="icon_badging_title" msgid="4418239350706629417">"Icones encerclades"</string>
+ <string name="icon_badging_desc_on" msgid="6022379097717134764">"Activades per a totes les aplicacions"</string>
+ <string name="icon_badging_desc_off" msgid="1574640601251590211">"Desactivades per a totes les aplicacions"</string>
<string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Afegeix la icona a la pantalla d\'inici"</string>
<string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Per a les aplicacions noves"</string>
<!-- no translation found for icon_shape_override_label (2977264953998281004) -->
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 506f433..eef716e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -77,7 +77,7 @@
<string name="allow_rotation_title" msgid="7728578836261442095">"Asosiy ekranni aylantirishga ruxsat berish"</string>
<string name="allow_rotation_desc" msgid="8662546029078692509">"Telefon burilganda"</string>
<string name="allow_rotation_blocked_desc" msgid="3212602545192996253">"Ekran sozlamalariga ko‘ra uni aylantirib bo‘lmaydi"</string>
- <string name="icon_badging_title" msgid="4418239350706629417">"Nishonchalar"</string>
+ <string name="icon_badging_title" msgid="4418239350706629417">"Ikonka ustida nishoncha"</string>
<string name="icon_badging_desc_on" msgid="6022379097717134764">"Barcha ilovalar uchun yoniq"</string>
<string name="icon_badging_desc_off" msgid="1574640601251590211">"Barcha ilovalar uchun o‘chiq"</string>
<string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Bosh ekranga ikonka qo‘shish"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c91cfd6..1a42ad8 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -78,8 +78,8 @@
<string name="allow_rotation_desc" msgid="8662546029078692509">"當手機旋轉時"</string>
<string name="allow_rotation_blocked_desc" msgid="3212602545192996253">"「目前顯示屏」設定不允許旋轉"</string>
<string name="icon_badging_title" msgid="4418239350706629417">"在圖示上顯示標誌"</string>
- <string name="icon_badging_desc_on" msgid="6022379097717134764">"為所有應用程式開啟此設定"</string>
- <string name="icon_badging_desc_off" msgid="1574640601251590211">"為所有應用程式關閉此設定"</string>
+ <string name="icon_badging_desc_on" msgid="6022379097717134764">"已為所有應用程式開啟"</string>
+ <string name="icon_badging_desc_off" msgid="1574640601251590211">"已為所有應用程式關閉"</string>
<string name="auto_add_shortcuts_label" msgid="8222286205987725611">"將圖示加到主畫面"</string>
<string name="auto_add_shortcuts_description" msgid="7117251166066978730">"適用於新安裝的應用程式"</string>
<!-- no translation found for icon_shape_override_label (2977264953998281004) -->
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 8dcf5c9..80338ca 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1437,6 +1437,9 @@
@Override
public void onAdd(ShortcutInfo item, int rank) {
View view = mContent.createAndAddViewForRank(item, rank);
+ mLauncher.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX,
+ item.cellY);
+
ArrayList<View> items = new ArrayList<>(getItemsInReadingOrder());
items.add(rank, view);
mContent.arrangeChildren(items, items.size());