Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose
diff --git a/protos/backup.proto b/protos/backup.proto
index f43f338..7ba2937 100644
--- a/protos/backup.proto
+++ b/protos/backup.proto
@@ -24,6 +24,7 @@
FAVORITE = 1;
SCREEN = 2;
ICON = 3;
+ WIDGET = 4;
}
required Type type = 1;
optional string name = 2; // keep this short
@@ -71,6 +72,14 @@
}
message Resource {
- required int32 dpi = 2;
- required bytes data = 3;
+ required int32 dpi = 1;
+ required bytes data = 2;
+ }
+
+message Widget {
+ required string provider = 1;
+ optional string label = 2;
+ optional bool configure = 3;
+ optional Resource icon = 4;
+ optional Resource preview = 5;
}
diff --git a/res/layout-land/first_run_cling.xml b/res/layout-land/first_run_cling.xml
index 3b21e14..9baee64 100644
--- a/res/layout-land/first_run_cling.xml
+++ b/res/layout-land/first_run_cling.xml
@@ -25,26 +25,31 @@
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/bubble_content"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:layout_marginLeft="100dp"
+ android:layout_marginRight="100dp"
android:orientation="vertical">
<TextView
style="@style/ClingAltTitleText"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"
android:text="@string/first_run_cling_title"
android:textColor="#FFFFFFFF"
- android:textSize="30sp" />
+ android:textSize="30sp"
+ android:gravity="center" />
<TextView
style="@style/ClingAltTitleText"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
android:text="@string/first_run_cling_description"
android:textColor="#80000000"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:gravity="center" />
</LinearLayout>
<TextView
style="@style/ClingHintText"
@@ -53,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:layout_marginEnd="10dp"
- android:layout_marginTop="80dp"
+ android:layout_marginTop="65dp"
android:visibility="gone"
android:drawableTop="@drawable/cling_arrow_up"
android:drawablePadding="5dp"
@@ -76,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="10dp"
- android:layout_marginBottom="100dp"
+ android:layout_marginBottom="85dp"
android:drawableEnd="@drawable/cling_arrow_right"
android:drawablePadding="5dp"
android:text="@string/first_run_cling_create_screens_hint" />
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml
index 08fb8cf..db33db0 100644
--- a/res/layout-land/workspace_cling.xml
+++ b/res/layout-land/workspace_cling.xml
@@ -25,13 +25,11 @@
android:layout_height="match_parent"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="100dp">
+ android:layout_marginTop="310dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:layout_marginBottom="40dp"
+ android:layout_gravity="top"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml
index 3b21e14..9baee64 100644
--- a/res/layout-port/first_run_cling.xml
+++ b/res/layout-port/first_run_cling.xml
@@ -25,26 +25,31 @@
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/bubble_content"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:layout_marginLeft="100dp"
+ android:layout_marginRight="100dp"
android:orientation="vertical">
<TextView
style="@style/ClingAltTitleText"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"
android:text="@string/first_run_cling_title"
android:textColor="#FFFFFFFF"
- android:textSize="30sp" />
+ android:textSize="30sp"
+ android:gravity="center" />
<TextView
style="@style/ClingAltTitleText"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
android:text="@string/first_run_cling_description"
android:textColor="#80000000"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:gravity="center" />
</LinearLayout>
<TextView
style="@style/ClingHintText"
@@ -53,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:layout_marginEnd="10dp"
- android:layout_marginTop="80dp"
+ android:layout_marginTop="65dp"
android:visibility="gone"
android:drawableTop="@drawable/cling_arrow_up"
android:drawablePadding="5dp"
@@ -76,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="10dp"
- android:layout_marginBottom="100dp"
+ android:layout_marginBottom="85dp"
android:drawableEnd="@drawable/cling_arrow_right"
android:drawablePadding="5dp"
android:text="@string/first_run_cling_create_screens_hint" />
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index 38d3858..db33db0 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -25,12 +25,11 @@
android:layout_height="match_parent"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="120dp">
+ android:layout_marginTop="310dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
+ android:layout_gravity="top"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index e488601..11a938f 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -78,10 +78,4 @@
android:layout_marginBottom="@dimen/apps_customize_page_indicator_margin" />
</FrameLayout>
</LinearLayout>
-
- <include layout="@layout/all_apps_cling"
- android:id="@+id/all_apps_cling"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone" />
</com.android.launcher3.AppsCustomizeTabHost>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 62d2325..5d19114 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Programme-bladsy %1$d van %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Legstukke-bladsy %1$d van %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Welkom!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Maak jouself tuis."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Maak jouself tuis."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Skep meer skerms vir programme en vouers"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9580e13..1fb96d3 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"የመተግበሪያዎች ገጽ %1$d ከ%2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"የመግብሮች ገጽ %1$d ከ%2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"እንኳን ደህና መጡ!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"ልክ እንደ እቤትዎ ዘና ይበሉ"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"ልክ እቤትዎ እንዳሉ ሆነው ዘና ይበሉ።"</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"ለመተግበሪያዎች እና አቃፊዎች ተጨማሪ ማያ ገጾችን ይፍጠሩ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index beb2452..330fe99 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"صفحة التطبيقات %1$d من %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"صفحة الأدوات %1$d من %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"مرحبًا!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"تصرف كما يحلو لك"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"تصرف على راحتك."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"إنشاء المزيد من الشاشات للتطبيقات والمجلدات"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index aa2e1a1..1a88d4a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -163,7 +163,7 @@
<skip />
<!-- no translation found for first_run_cling_title (7257389003637362144) -->
<skip />
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index aef1f0d..ab4d9ce 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Страница с приложения %1$d от %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Страница с приспособления %1$d от %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Добре дошли!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Създаване на още екрани за приложения и папки"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Организиране на мястото ви"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Докоснете и задръжте фона, за да управлявате тапета, приспособленията и настройките."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Изберете някои приложения"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"За да добавите приложение към началния си екран, го докоснете и задръжте."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Ето една папка"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"За да създадете подобна, докоснете и задръжте приложение, след което го преместете върху друго."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"ОK"</string>
<string name="folder_opened" msgid="94695026776264709">"Папката е отворена – <xliff:g id="WIDTH">%1$d</xliff:g> на <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Докоснете, за да затворите папката"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ba71302..21fd223 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -87,7 +87,7 @@
<string name="permdesc_write_settings" msgid="5440712911516509985">"Permet que l\'aplicació canviï la configuració i les dreceres de la pantalla d\'inici."</string>
<string name="gadget_error_text" msgid="6081085226050792095">"S\'ha produït un problema en carregar el widget"</string>
<string name="uninstall_system_app_text" msgid="4172046090762920660">"Aquesta aplicació és una aplicació del sistema i no es pot desinstal·lar."</string>
- <string name="dream_name" msgid="1530253749244328964">"Llançamíssils"</string>
+ <string name="dream_name" msgid="1530253749244328964">"Rocket Launcher"</string>
<string name="folder_hint_text" msgid="6617836969016293992">"Carpeta sense nom"</string>
<string name="workspace_description_format" msgid="2950174241104043327">"Pantalla d\'inici %1$d"</string>
<string name="default_scroll_format" msgid="7475544710230993317">"Pàgina %1$d de %2$d"</string>
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pàgina d\'aplicacions %1$d de %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pàgina de widgets %1$d de %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Hola!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Posa\'t còmode"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Posa\'t còmode."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea més pantalles per a aplicacions i carpetes"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 790ae19..c4e920f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -95,20 +95,16 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikací %1$d z %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka widgetů %1$d z %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Vítejte!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
- <skip />
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Udělejte si pohodlí."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvořte několik obrazovek pro aplikace a složky"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Organizace prostoru"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Chcete-li spravovat tapetu, widgety a nastavení, dotkněte se pozadí a přidržte je."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Vyberte nějaké aplikace"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Chcete-li na plochu přidat aplikaci, dotkněte se jí a přidržte ji."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Toto je složka"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Chcete-li vytvořit složku, přetáhněte aplikaci na jinou aplikaci."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"Složka otevřena, rozměry <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Dotykem složku zavřete"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7ce4b29..446dc51 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-side %1$d ud af %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-side %1$d ud af %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Velkommen"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Tilpas din startskærm."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Føl dig hjemme."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opret flere skærme til apps og mapper"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 658ed93..1ebf08a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Willkommen!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Gerät personalisieren"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Weitere Bildschirme für Apps und Ordner erstellen"</string>
@@ -104,7 +104,7 @@
<string name="all_apps_cling_title" msgid="34929250753095858">"Apps auswählen"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Berühren und halten Sie eine App, um sie zum Startbildschirm hinzuzufügen."</string>
<string name="folder_cling_title" msgid="3894908818693254164">"Hier ist ein Ordner"</string>
- <string name="folder_cling_create_folder" msgid="6158215559475836131">"Um eine ähnliche App zu erstellen, berühren und halten Sie eine App und verschieben Sie sie auf eine andere."</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Um einen Ordner zu erstellen, berühren und halten Sie eine App und verschieben Sie sie auf eine andere."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"Ordner geöffnet, <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Ordner durch Berühren schließen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3530ddf..57ade2b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Σελίδα εφαρμογών %1$d από %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Σελίδα γραφικών στοιχείων %1$d από %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Καλώς ορίσατε!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Νιώστε σαν στο σπίτι σας"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Νιώστε σαν στο σπίτι σας."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Δημιουργία περισσότερων οθονών για εφαρμογές και φακέλους"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 64578f9..ae7d44d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps page %1$d of %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets page %1$d of %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Welcome!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Make yourself at Home."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Make yourself at home."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Create more screens for apps and folders"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3dfc328..64ec076 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"¡Bienvenido/a!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Siéntete como en casa."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index abf2ff4..0b04260 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -95,12 +95,12 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Te damos la bienvenida"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Personaliza tu página de inicio."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Personaliza tu pantalla principal."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
- <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para administrar el fondo de pantalla, los widgets y los ajustes."</string>
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para gestionar el fondo de pantalla, los widgets y los ajustes."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Selecciona algunas aplicaciones"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Para añadir una aplicación a tu pantalla de inicio, solo tienes que mantenerla pulsada."</string>
<string name="folder_cling_title" msgid="3894908818693254164">"Esto es una carpeta"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 34fca43..cc95f47 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Rakenduste leht %1$d/%2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Vidinate leht %1$d/%2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Tere tulemast!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Tundke end nagu kodus."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Tundke end nagu kodus."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Looge rakenduste ja kaustade jaoks rohkem ekraanikuvasid"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 229907e..e3787cf 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -95,20 +95,16 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"صفحه برنامهها %1$d از %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"صفحه ابزارکها %1$d از %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"خوش آمدید!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
- <skip />
+ <string name="first_run_cling_description" msgid="6447072552696253358">"راحت باشید."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"صفحات بیشتری را برای برنامهها و پوشهها ایجاد کنید"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"فضای خود را سازماندهی کنید"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"برای مدیریت کاغذدیواری، ابزارکها و تنظیمات، پسزمینه را لمس کرده و نگهدارید."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"چند برنامه انتخاب کنید"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"اگر میخواهید برنامهای را به صفحه اصلی خود اضافه کنید، آن را لمس کرده، نگهدارید."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"اینجا یک پوشه است"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"برای ایجاد پوشهای مثل این، یک برنامه را لمس کرده و نگهدارید، سپس آن را روی برنامه دیگر بیاندازید."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"تأیید"</string>
<string name="folder_opened" msgid="94695026776264709">"پوشه باز شده، <xliff:g id="WIDTH">%1$d</xliff:g> در <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"برای بستن پوشه لمس کنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f00323e..9b33c6b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-sivu %1$d / %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgetit-sivu %1$d / %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Tervetuloa!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Ole kuin kotonasi"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Ole kuin kotonasi."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Luo lisää ruutuja sovelluksille ja kansioille"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f8bb2f5..16d17b5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Page des applications %1$d sur %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Page des widgets %1$d sur %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Bienvenue !"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Familiarisez-vous avec l\'écran d\'accueil."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Créer plus d\'écrans pour les applications et les dossiers"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5661f2a..ec211d7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"एप्लिकेशन पृष्ठ %2$d में से %1$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"विजेट पृष्ठ %2$d में से %1$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"स्वागत है!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"जैसा चाहें वैसा उपयोग करें."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"जैसा चाहें वैसा उपयोग करें."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"एप्लिकेशन और फ़ोल्डर के लिए और अधिक स्क्रीन बनाएं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4bfb189..b53713b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stranica aplikacija %1$d od %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stranica widgeta %1$d od %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Dobro došli!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Osjećajte se kao kod kuće"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Osjećajte se kao kod kuće."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Izradite više zaslona za aplikacije i mape"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d21da36..a2170c8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%2$d/%1$d. alkalmazásoldal"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%2$d/%1$d. moduloldal"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Üdvözöljük!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Érezze magát otthon."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Szabja személyre készülékét."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Hozzon létre további képernyőket az alkalmazásoknak és mappáknak"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fdb3397..a173eef 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Laman aplikasi %1$d dari %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Laman widget %1$d dari %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Selamat datang!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Serasa di Rumah sendiri."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak layar untuk aplikasi dan folder"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e9112ff..bcbec0a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pagina di applicazioni %1$d di %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pagina di widget %1$d di %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Benvenuto!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Personalizza la schermata Home."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Personalizza la schermata Home."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Creare più schermate per app e cartelle"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index bd3064e..9d4d9d2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -95,16 +95,16 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"דף אפליקציות %1$d מתוך %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"דף רכיבי ווידג\'ט %1$d מתוך %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"ברוך הבא!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"תרגיש בבית."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"להרגיש בבית."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"צור מסכים נוספים עבור אפליקציות ותיקיות"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"ארגן את אזור העבודה שלך"</string>
- <string name="workspace_cling_move_item" msgid="528201129978005352">"גע נגיעה רציפה ברקע כדי לנהל את הטפט, רכיבי ווידג\'ט ואת ההגדרות."</string>
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"גע נגיעה רציפה ברקע כדי לנהל את הטפט, רכיבי הווידג\'ט וההגדרות."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"בחר כמה אפליקציות"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"כדי להוסיף אפליקציה למסך דף הבית, גע בה נגיעה רציפה."</string>
<string name="folder_cling_title" msgid="3894908818693254164">"הנה תיקייה"</string>
- <string name="folder_cling_create_folder" msgid="6158215559475836131">"כדי ליצור אחת כזו, גע נגיעה רציפה באפליקציה, ולאחר מכן גרור ושחרר אותו על-גבי אפליקציה אחרת."</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"כדי ליצור תיקייה כזו, גע נגיעה רציפה באפליקציה, ולאחר מכן גרור ושחרר אותו על-גבי אפליקציה אחרת."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"אישור"</string>
<string name="folder_opened" msgid="94695026776264709">"תיקיה פתוחה, <xliff:g id="WIDTH">%1$d</xliff:g> על <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"גע כדי לסגור את התיקיה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2aa5402..c369f75 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"アプリの%1$d/%2$dページ"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ウィジェットの%1$d/%2$dページ"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"ようこそ！"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"ホームをカスタマイズします"</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"アプリとフォルダの画面をもっと作成します"</string>
@@ -104,7 +105,7 @@
<string name="all_apps_cling_title" msgid="34929250753095858">"アプリの選択"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"アプリをホーム画面に追加するにはアプリを押し続けます。"</string>
<string name="folder_cling_title" msgid="3894908818693254164">"これがフォルダです"</string>
- <string name="folder_cling_create_folder" msgid="6158215559475836131">"これを同じものを作成するには、アプリを押し続けてから別のアプリの上に移動します。"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"これと同じフォルダを作成するには、アプリを押し続けてから別のアプリの上に移動します。"</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"フォルダが開いています。<xliff:g id="WIDTH">%1$d</xliff:g>x<xliff:g id="HEIGHT">%2$d</xliff:g>の大きさです"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"タップしてフォルダを閉じます"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3e74d78..4567648 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"앱 페이지 %1$d/%2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"위젯 페이지 %1$d/%2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"환영합니다!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"앱 및 폴더를 표시할 화면 더 만들기"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"공간 관리하기"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"배경화면, 위젯, 설정을 관리하려면 백그라운드를 길게 터치합니다."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"앱 선택하기"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"홈 화면에 앱을 추가하려면 길게 터치합니다."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"폴더"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"폴더를 만들려면 앱을 길게 터치한 다음 다른 앱 위에 올려 놓으세요."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"확인"</string>
<string name="folder_opened" msgid="94695026776264709">"폴더 열림(<xliff:g id="WIDTH">%1$d</xliff:g>X<xliff:g id="HEIGHT">%2$d</xliff:g>)"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"터치하여 폴더를 닫음"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 455aba6..690aa80 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d programų psl. iš %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d valdiklių psl. iš %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Sveiki!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Jauskitės kaip namie."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Sukurkite daugiau programų ir aplankų ekrano kopijų"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index aeebc4c..e622b5f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d. lietotņu lapa no %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d. logrīku lapa no %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Laipni lūdzam!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Jūtieties kā mājās."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Informācija par pamatfunkcijām"</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Izveidojiet vairāk ekrānu lietotnēm un mapēm."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 8c8ef32..f555c8f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Halaman apl %1$d daripada %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Halaman widget %1$d daripada %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Selamat datang!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak skrin untuk apl dan folder"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Susun ruang anda"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Sentuh & tahan latar belakang untuk mengurus kertas dinding, widget dan tetapan."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Pilih beberapa apl"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Untuk menambahkan apl pada skrin Laman Utama anda, sentuh & tahan apl."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Ini ada folder"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Untuk membuat satu folder seperti ini, sentuh & tahan apl, kemudian alihkan ke atas folder lain."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"Folder dibuka, <xliff:g id="WIDTH">%1$d</xliff:g> kali <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Sentuh untuk menutup folder"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2b794b5..608e973 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Appside %1$d av %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Modulside %1$d av %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Velkommen!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opprett flere sider for apper og mapper"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Organiser plassen din"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Trykk og hold på bakgrunnen for å administrere bakgrunnen, moduler og innstillinger."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Velg noen apper"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Trykk og hold på en app for å legge den til på startsiden."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Dette er en mappe"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"For å opprette en som denne, trykker og holder du på en app og flytter den over en annen."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"Mappen er åpnet – <xliff:g id="WIDTH">%1$d</xliff:g> ganger <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Trykk for å lukke mappen"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index eade87b..93d3330 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"App-pagina %1$d van %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgetpagina %1$d van %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Welkom!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Personaliseer uw startscherm."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Personaliseer uw startscherm."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Meer schermen maken voor apps en mappen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index db6c463..7de61e9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Strona aplikacji: %1$d z %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Strona widżetów: %1$d z %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Witamy!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Poczuj się jak u siebie."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Dodaj więcej ekranów na aplikacje i foldery"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7f5a2e7..35bf77c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicações %1$d de %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Bem-vindo(a)!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Sinta-se em casa."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Sinta-se em casa."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais ecrãs para aplicações e pastas"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e7c444e..dc42fe9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicativos, %1$d de %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets, %1$d de %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Bem-vindo!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Sinta-se em casa"</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais telas para aplicativos e pastas"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index aa2e1a1..1a88d4a 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -163,7 +163,7 @@
<skip />
<!-- no translation found for first_run_cling_title (7257389003637362144) -->
<skip />
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bb19702..29fe9d2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pagina de aplicații %1$d din %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pagina de widgeturi %1$d din %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Bun venit!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Creați mai multe ecrane pentru aplicații și dosare"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Organizați-vă spațiul"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Atingeți lung fundalul pentru a gestiona imaginea de fundal, widgeturile și setările."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Alegeți unele aplicații"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Atingeți lung o aplicație pentru a o adăuga pe ecranul de pornire."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Iată un dosar"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Pentru a crea un dosar similar, atingeți și țineți degetul pe o aplicație, apoi mutați-o deasupra alteia."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"Dosar deschis, <xliff:g id="WIDTH">%1$d</xliff:g> pe <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Atingeți pentru a închide dosarul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8623c13..8a52ac2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Приложения: стр. %1$d из %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Виджеты: стр. %1$d из %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Добро пожаловать!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Создание дополнительных экранов для приложений и папок"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Организация рабочего пространства"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Чтобы перейти к управлению обоями, виджетами и настройками, нажмите на фоновое изображение и удерживайте его."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Выберите приложения"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Чтобы добавить приложение на главный экран, нажмите на значок и удерживайте его."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Это папка"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Чтобы создать папку, нажмите и удерживайте значок приложения, а затем перетащите его на другой значок."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"ОК"</string>
<string name="folder_opened" msgid="94695026776264709">"Папка открыта, <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Нажмите, чтобы закрыть папку"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0ae4f95..2bc668e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikácií %1$d z %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka miniaplikácií %1$d z %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Vitajte!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvorte viac obrazoviek pre aplikácie a priečinky"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Usporiadajte svoj priestor"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Ak chcete spravovať tapetu, miniaplikácie a nastavenia, dotknite sa pozadia a podržte."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Vyberte niektoré aplikácie"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Ak chcete pridať aplikáciu na plochu, dotknite sa jej a podržte."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"Tu je priečinok"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Ak chcete vytvoriť takýto priečinok, dotknite sa príslušnej aplikácie a podržte ju. Potom ju presuňte na druhú aplikáciu."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
<string name="folder_opened" msgid="94695026776264709">"Otvorený priečinok, <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Dotykom zavriete priečinok"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 44485ea..41716a0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -95,20 +95,16 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stran aplikacij %1$d od %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stran pripomočkov %1$d od %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Pozdravljeni!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
- <skip />
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Počutite se kot doma."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Ustvarite več zaslonov za aplikacije in mape"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Organizirajte svoj prostor"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Če želite upravljati ozadje, pripomočke in nastavitve, se dotaknite ozadja in ga pridržite."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Izberite nekaj aplikacij"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Če želite dodati aplikacijo na začetni zaslon, se je dotaknite in jo pridržite."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"To je mapa"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Če želite ustvariti mapo, podobno tej, se dotaknite aplikacije in jo pridržite, nato pa jo premaknite nad drugo."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"V redu"</string>
<string name="folder_opened" msgid="94695026776264709">"Mapa je odprta, <xliff:g id="WIDTH">%1$d</xliff:g> krat <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Dotaknite se, da zaprete mapo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a3811e7..11c5dea 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -95,12 +95,13 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d. страница апликација од %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d. страница виџета од %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Добро дошли!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Осећајте се као код куће."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Направите још екрана за апликације и директоријуме"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Организујте простор"</string>
- <string name="workspace_cling_move_item" msgid="528201129978005352">"Додирните и задржите позадину да бисте управљали позадином, виџетима и подешавањима."</string>
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Додирните позадину и задржите да бисте управљали позадином, виџетима и подешавањима."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Изаберите неколико апликација"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Да бисте додали апликацију на почетни екран, додирните је и задржите."</string>
<string name="folder_cling_title" msgid="3894908818693254164">"Ево једног директоријума"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cce8ee2..fbbf6b6 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Appsida %1$d av %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget-sida %1$d av %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Välkommen!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Känn dig som hemma"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Känn dig som hemma."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Skapa fler skärmar för appar och mappar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5cca72d..2b3737b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -97,20 +97,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ukurasa wa programu %1$d ya %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Ukurasa wa wijeti %1$d ya %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Karibu!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Unda skrini zaidi za programu na folda"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Panga nafasi yako"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Gusa na ushikile mandharinyuma ili udhibiti mandhari, wijeti, na mipangilio."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"Chagua programu kadhaa"</string>
- <string name="all_apps_cling_add_item" msgid="400866858451850784">"Ili kuongeza programu kwenye Skrini yako ya nyumbani, iguse na uishikilie."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="all_apps_cling_add_item" msgid="400866858451850784">"Ili kuongeza programu kwenye Skrini yako Kuu, iguse na uishikilie."</string>
+ <string name="folder_cling_title" msgid="3894908818693254164">"Folda hii hapa"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Ili kuunda kama hii, gusa na ushikilie programu, kisha ipitishe juu ya nyingine."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"SAWA"</string>
<string name="folder_opened" msgid="94695026776264709">"Folda imefunguliwa, <xliff:g id="WIDTH">%1$d</xliff:g> kwa <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Gusa ili ufunge folda"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8ba171d..80467aa 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"แอปหน้า %1$d จาก %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"วิดเจ็ตหน้า %1$d จาก %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"ยินดีต้อนรับ!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"ทำตัวตามสบาย"</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"สร้างหน้าจอเพิ่มสำหรับแอปและโฟลเดอร์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3d472b5..abbd393 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pahina ng apps %1$d ng %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pahina ng widget %1$d ng %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Maligayang pagdating!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Gawing kumportable ang iyong sarili."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Gumawa ng higit pang mga screen para sa apps at mga folder"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 035a4e7..29addaa 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Uygulama sayfası %1$d / %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget sayfası %1$d / %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Hoş geldiniz!"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Uygulamalar ve klasörler için daha fazla ekran oluşturun"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"Alanınızı düzenleyin"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"Duvar kağıdını, widget\'ları ve ayarları yönetmek için arka plana uzun basın."</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"İstediğiniz uygulamaları seçin"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"Bir uygulamayı Ana ekranınıza eklemek için, ilgili uygulamayı basılı tutun."</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"İşte bir klasör"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"Buna benzer bir klasör oluşturmak için uygulamaya uzun basın ve sonra uygulamayı başka bir uygulamanın üzerine taşıyın."</string>
<string name="cling_dismiss" msgid="8962359497601507581">"Tamam"</string>
<string name="folder_opened" msgid="94695026776264709">"Klasör açıldı, <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"Klasörü kapatmak için dokunun"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c2faf03..e1fc491 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Сторінка програм %1$d з %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Сторінка віджетів %1$d з %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Вітаємо!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Будьте як удома."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте як удома."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Створюйте нові екрани для програм і папок"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8c83867..efd34cf 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Trang ứng dụng %1$d / %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Trang tiện ích con %1$d / %2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Xin chào!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Hãy sử dụng tự nhiên."</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Tạo thêm màn hình cho ứng dụng và thư mục"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e7cfc25..5b13f8a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -95,20 +95,17 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"应用：第%1$d页，共%2$d页"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小部件：第%1$d页，共%2$d页"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"欢迎！"</string>
- <!-- no translation found for first_run_cling_description (7401277885309232757) -->
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"添加更多屏幕来容纳应用和文件夹"</string>
<string name="workspace_cling_title" msgid="5626202359865825661">"整理您的空间"</string>
- <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
- <skip />
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"触摸并按住背景，即可管理壁纸、小部件和设置。"</string>
<string name="all_apps_cling_title" msgid="34929250753095858">"选择一些应用"</string>
<string name="all_apps_cling_add_item" msgid="400866858451850784">"要将应用添加到主屏幕，请触摸并按住该应用。"</string>
- <!-- no translation found for folder_cling_title (3894908818693254164) -->
- <skip />
- <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
- <skip />
+ <string name="folder_cling_title" msgid="3894908818693254164">"文件夹如下显示："</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"要创建一个类似的文件夹，请触摸并按住某个应用，然后将其移至另一个应用上。"</string>
<string name="cling_dismiss" msgid="8962359497601507581">"确定"</string>
<string name="folder_opened" msgid="94695026776264709">"文件夹已打开，大小为<xliff:g id="WIDTH">%1$d</xliff:g>×<xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1884479294466410023">"触摸可关闭文件夹"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9c17819..32c5964 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -95,7 +95,8 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"應用程式：第 %1$d 頁，共 %2$d 頁"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小工具：第 %1$d 頁，共 %2$d 頁"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"歡迎使用！"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"主螢幕由您作主。"</string>
+ <!-- no translation found for first_run_cling_description (6447072552696253358) -->
+ <skip />
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"建立更多畫面容納應用程式和資料夾"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index abe5c4d..1a711a8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ikhasi lezinhlelo zokusebenza elingu-%1$d le-%2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Ikhasi lamawijethi elingu-%1$d le-%2$d"</string>
<string name="first_run_cling_title" msgid="7257389003637362144">"Siyakwamukela!"</string>
- <string name="first_run_cling_description" msgid="7401277885309232757">"Zizwe Usekhaya."</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"Zizwe usekhaya."</string>
<string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
<string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Dala izikrini eziningi zezinhlelo zokusebenza namafolda"</string>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1dcc5dd..a2d3a83 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -148,6 +148,9 @@
<attr name="key" format="string" />
<attr name="value" format="string" />
</declare-styleable>
+ <declare-styleable name="Include">
+ <attr name="workspace" format="reference" />
+ </declare-styleable>
<!-- Only used in the device overlays -->
<declare-styleable name="CustomClingTitleText">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e4278d9..dc35a3f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,5 +36,5 @@
<color name="folder_items_text_color">#FF333333</color>
<color name="outline_color">#FFFFFFFF</color>
- <color name="first_run_cling_circle_background_color">#FF8BB4E9</color>
+ <color name="first_run_cling_circle_background_color">#64b1ea</color>
</resources>
diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java
index 2656ad6..de92605 100644
--- a/src/com/android/launcher3/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -327,7 +327,7 @@
}
if (mDrawIdentifier.equals(FIRST_RUN_PORTRAIT) ||
mDrawIdentifier.equals(FIRST_RUN_LANDSCAPE)) {
- // Draw the white circle
+ // Draw the circle
View bubbleContent = findViewById(R.id.bubble_content);
Rect bubbleRect = new Rect();
bubbleContent.getGlobalVisibleRect(bubbleRect);
diff --git a/src/com/android/launcher3/LauncherBackupAgent.java b/src/com/android/launcher3/LauncherBackupAgent.java
index cbef36b..95c1b84 100644
--- a/src/com/android/launcher3/LauncherBackupAgent.java
+++ b/src/com/android/launcher3/LauncherBackupAgent.java
@@ -28,6 +28,7 @@
import com.android.launcher3.backup.BackupProtos.Key;
import com.android.launcher3.backup.BackupProtos.Resource;
import com.android.launcher3.backup.BackupProtos.Screen;
+import com.android.launcher3.backup.BackupProtos.Widget;
import android.app.backup.BackupAgent;
import android.app.backup.BackupDataInput;
@@ -42,6 +43,7 @@
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
import android.os.ParcelFileDescriptor;
import android.text.TextUtils;
import android.util.Base64;
@@ -67,12 +69,18 @@
public class LauncherBackupAgent extends BackupAgent {
private static final String TAG = "LauncherBackupAgent";
- private static final boolean DEBUG = true;
+ private static final boolean DEBUG = false;
private static final int MAX_JOURNAL_SIZE = 1000000;
+ /** icons are large, dribble them out */
private static final int MAX_ICONS_PER_PASS = 10;
+ /** widgets contain previews, which are very large, dribble them out */
+ private static final int MAX_WIDGETS_PER_PASS = 5;
+
+ public static final int IMAGE_COMPRESSION_QUALITY = 75;
+
private static BackupManager sBackupManager;
private static final String[] FAVORITE_PROJECTION = {
@@ -177,6 +185,7 @@
backupFavorites(in, data, out, keys);
backupScreens(in, data, out, keys);
backupIcons(in, data, out, keys);
+ backupWidgets(in, data, out, keys);
out.key = keys.toArray(BackupProtos.Key.EMPTY_ARRAY);
writeJournal(newState, out);
@@ -229,6 +238,10 @@
restoreIcon(key, buffer, dataSize, keys);
break;
+ case Key.WIDGET:
+ restoreWidget(key, buffer, dataSize, keys);
+ break;
+
default:
Log.w(TAG, "unknown restore entity type: " + key.type);
break;
@@ -393,9 +406,10 @@
*/
private void backupIcons(Journal in, BackupDataOutput data, Journal out,
ArrayList<Key> keys) throws IOException {
- // persist icons for new shortcuts since the last backup
+ // persist icons that haven't been persisted yet
final ContentResolver cr = getContentResolver();
- final IconCache iconCache = new IconCache(this);
+ final LauncherAppState app = LauncherAppState.getInstance();
+ final IconCache iconCache = app.getIconCache();
final int dpi = getResources().getDisplayMetrics().densityDpi;
// read the old ID set
@@ -441,7 +455,7 @@
writeRowToBackup(key, blob, out, data);
}
} else {
- if (DEBUG) Log.d(TAG, "scheduling another rtun for icon " + backupKey);
+ if (DEBUG) Log.d(TAG, "scheduling another run for icon " + backupKey);
// too many icons for this pass, request another.
dataChanged(this);
}
@@ -466,7 +480,7 @@
/**
* Read an icon from the stream.
*
- * <P>Keys arrive in any order, so shortcuts that use this screen may already exist.
+ * <P>Keys arrive in any order, so shortcuts that use this icon may already exist.
*
* @param key identifier for the row
* @param buffer the serialized proto from the stream, may be larger than dataSize
@@ -492,6 +506,115 @@
}
}
+ /**
+ * Write all the static widget resources we need to render placeholders
+ * for a package that is not installed.
+ *
+ * @param in notes from last backup
+ * @param data output stream for key/value pairs
+ * @param out notes about this backup
+ * @param keys keys to mark as clean in the notes for next backup
+ * @throws IOException
+ */
+ private void backupWidgets(Journal in, BackupDataOutput data, Journal out,
+ ArrayList<Key> keys) throws IOException {
+ // persist static widget info that hasn't been persisted yet
+ final ContentResolver cr = getContentResolver();
+ final PagedViewCellLayout widgetSpacingLayout = new PagedViewCellLayout(this);
+ final WidgetPreviewLoader previewLoader = new WidgetPreviewLoader(this);
+ final LauncherAppState appState = LauncherAppState.getInstance();
+ final IconCache iconCache = appState.getIconCache();
+ final int dpi = getResources().getDisplayMetrics().densityDpi;
+ final DeviceProfile profile = appState.getDynamicGrid().getDeviceProfile();
+ if (DEBUG) Log.d(TAG, "cellWidthPx: " + profile.cellWidthPx);
+
+ // read the old ID set
+ Set<String> savedIds = getSavedIdsByType(Key.WIDGET, in);
+ if (DEBUG) Log.d(TAG, "widgets savedIds.size()=" + savedIds.size());
+
+ int startRows = out.rows;
+ if (DEBUG) Log.d(TAG, "starting here: " + startRows);
+ String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPWIDGET;
+ Cursor cursor = cr.query(Favorites.CONTENT_URI, FAVORITE_PROJECTION,
+ where, null, null);
+ Set<String> currentIds = new HashSet<String>(cursor.getCount());
+ try {
+ cursor.moveToPosition(-1);
+ while(cursor.moveToNext()) {
+ final long id = cursor.getLong(ID_INDEX);
+ final String providerName = cursor.getString(APPWIDGET_PROVIDER_INDEX);
+ final int spanX = cursor.getInt(SPANX_INDEX);
+ final int spanY = cursor.getInt(SPANY_INDEX);
+ final ComponentName provider = ComponentName.unflattenFromString(providerName);
+ Key key = null;
+ String backupKey = null;
+ if (provider != null) {
+ key = getKey(Key.WIDGET, providerName);
+ backupKey = keyToBackupKey(key);
+ currentIds.add(backupKey);
+ } else {
+ Log.w(TAG, "empty intent on appwidget: " + id);
+ }
+ if (savedIds.contains(backupKey)) {
+ if (DEBUG) Log.d(TAG, "already saved widget " + backupKey);
+
+ // remember that we already backed this up previously
+ keys.add(key);
+ } else if (backupKey != null) {
+ if (DEBUG) Log.d(TAG, "I can count this high: " + out.rows);
+ if ((out.rows - startRows) < MAX_WIDGETS_PER_PASS) {
+ if (DEBUG) Log.d(TAG, "saving widget " + backupKey);
+ previewLoader.setPreviewSize(spanX * profile.cellWidthPx,
+ spanY * profile.cellHeightPx, widgetSpacingLayout);
+ byte[] blob = packWidget(dpi, previewLoader, iconCache, provider);
+ writeRowToBackup(key, blob, out, data);
+
+ } else {
+ if (DEBUG) Log.d(TAG, "scheduling another run for widget " + backupKey);
+ // too many widgets for this pass, request another.
+ dataChanged(this);
+ }
+ }
+ }
+ } finally {
+ cursor.close();
+ }
+ if (DEBUG) Log.d(TAG, "widget currentIds.size()=" + currentIds.size());
+
+ // these IDs must have been deleted
+ savedIds.removeAll(currentIds);
+ out.rows += removeDeletedKeysFromBackup(savedIds, data);
+ }
+
+ /**
+ * Read a widget from the stream.
+ *
+ * <P>Keys arrive in any order, so widgets that use this data may already exist.
+ *
+ * @param key identifier for the row
+ * @param buffer the serialized proto from the stream, may be larger than dataSize
+ * @param dataSize the size of the proto from the stream
+ * @param keys keys to mark as clean in the notes for next backup
+ */
+ private void restoreWidget(Key key, byte[] buffer, int dataSize, ArrayList<Key> keys) {
+ Log.v(TAG, "unpacking widget " + key.id);
+ if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
+ Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
+ try {
+ Widget widget = unpackWidget(buffer, 0, dataSize);
+ if (DEBUG) Log.d(TAG, "unpacked " + widget.provider);
+ if (widget.icon.data != null) {
+ Bitmap icon = BitmapFactory
+ .decodeByteArray(widget.icon.data, 0, widget.icon.data.length);
+ if (icon == null) {
+ Log.w(TAG, "failed to unpack widget icon for " + key.name);
+ }
+ }
+ } catch (InvalidProtocolBufferNanoException e) {
+ Log.w(TAG, "failed to decode proto", e);
+ }
+ }
+
/** create a new key, with an integer ID.
*
* <P> Keys contain their own checksum instead of using
@@ -556,6 +679,8 @@
return "screen";
case Key.ICON:
return "icon";
+ case Key.WIDGET:
+ return "widget";
default:
return "anonymous";
}
@@ -650,7 +775,7 @@
Resource res = new Resource();
res.dpi = dpi;
ByteArrayOutputStream os = new ByteArrayOutputStream();
- if (icon.compress(WEBP, 100, os)) {
+ if (icon.compress(WEBP, IMAGE_COMPRESSION_QUALITY, os)) {
res.data = os.toByteArray();
}
return writeCheckedBytes(res);
@@ -664,6 +789,44 @@
return res;
}
+ /** Serialize a widget for persistence, including a checksum wrapper. */
+ private byte[] packWidget(int dpi, WidgetPreviewLoader previewLoader, IconCache iconCache,
+ ComponentName provider) {
+ final AppWidgetProviderInfo info = findAppWidgetProviderInfo(provider);
+ Widget widget = new Widget();
+ widget.provider = provider.flattenToShortString();
+ widget.label = info.label;
+ widget.configure = info.configure != null;
+ if (info.icon != 0) {
+ widget.icon = new Resource();
+ Drawable fullResIcon = iconCache.getFullResIcon(provider.getPackageName(), info.icon);
+ Bitmap icon = Utilities.createIconBitmap(fullResIcon, this);
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ if (icon.compress(WEBP, IMAGE_COMPRESSION_QUALITY, os)) {
+ widget.icon.data = os.toByteArray();
+ widget.icon.dpi = dpi;
+ }
+ }
+ if (info.previewImage != 0) {
+ widget.preview = new Resource();
+ Bitmap preview = previewLoader.generateWidgetPreview(info, null);
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ if (preview.compress(WEBP, IMAGE_COMPRESSION_QUALITY, os)) {
+ widget.preview.data = os.toByteArray();
+ widget.preview.dpi = dpi;
+ }
+ }
+ return writeCheckedBytes(widget);
+ }
+
+ /** Deserialize a widget from persistence, after verifying checksum wrapper. */
+ private Widget unpackWidget(byte[] buffer, int offset, int dataSize)
+ throws InvalidProtocolBufferNanoException {
+ Widget widget = new Widget();
+ MessageNano.mergeFrom(widget, readCheckedBytes(buffer, offset, dataSize));
+ return widget;
+ }
+
/**
* Read the old journal from the input file.
*
@@ -798,6 +961,18 @@
return wrapper.payload;
}
+ private AppWidgetProviderInfo findAppWidgetProviderInfo(ComponentName component) {
+ if (mWidgetMap == null) {
+ List<AppWidgetProviderInfo> widgets =
+ AppWidgetManager.getInstance(this).getInstalledProviders();
+ mWidgetMap = new HashMap<ComponentName, AppWidgetProviderInfo>(widgets.size());
+ for (AppWidgetProviderInfo info : widgets) {
+ mWidgetMap.put(info.provider, info);
+ }
+ }
+ return mWidgetMap.get(component);
+ }
+
private class KeyParsingException extends Throwable {
private KeyParsingException(Throwable cause) {
super(cause);
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 471d2d2..5a8f630 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -296,6 +296,7 @@
private static final String TAG_SHORTCUT = "shortcut";
private static final String TAG_FOLDER = "folder";
private static final String TAG_EXTRA = "extra";
+ private static final String TAG_INCLUDE = "include";
private final Context mContext;
private final AppWidgetHost mAppWidgetHost;
@@ -1011,6 +1012,8 @@
intent.addCategory(Intent.CATEGORY_LAUNCHER);
ContentValues values = new ContentValues();
+ if (LOGD) Log.v(TAG, String.format("Loading favorites from resid=0x%08x", workspaceResourceId));
+
PackageManager packageManager = mContext.getPackageManager();
int i = 0;
try {
@@ -1031,6 +1034,30 @@
boolean added = false;
final String name = parser.getName();
+ if (TAG_INCLUDE.equals(name)) {
+ final TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.Include);
+
+ final int resId = a.getResourceId(R.styleable.Include_workspace, 0);
+
+ if (LOGD) Log.v(TAG, String.format(("%" + (2*(depth+1)) + "s<include workspace=%08x>"),
+ "", resId));
+
+ if (resId != 0 && resId != workspaceResourceId) {
+ // recursively load some more favorites, why not?
+ i += loadFavorites(db, resId);
+ added = false;
+ mMaxItemId = -1;
+ } else {
+ Log.w(TAG, String.format("Skipping <include workspace=0x%08x>", resId));
+ }
+
+ a.recycle();
+
+ if (LOGD) Log.v(TAG, String.format(("%" + (2*(depth+1)) + "s</include>"), ""));
+ continue;
+ }
+
+ // Assuming it's a <favorite> at this point
TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.Favorite);
long container = LauncherSettings.Favorites.CONTAINER_DESKTOP;
@@ -1048,6 +1075,17 @@
values.put(LauncherSettings.Favorites.CELLX, x);
values.put(LauncherSettings.Favorites.CELLY, y);
+ if (LOGD) {
+ final String title = a.getString(R.styleable.Favorite_title);
+ final String pkg = a.getString(R.styleable.Favorite_packageName);
+ final String something = title != null ? title : pkg;
+ Log.v(TAG, String.format(
+ ("%" + (2*(depth+1)) + "s<%s%s c=%d s=%s x=%s y=%s>"),
+ "", name,
+ (something == null ? "" : (" \"" + something + "\"")),
+ container, screen, x, y));
+ }
+
if (TAG_FAVORITE.equals(name)) {
long id = addAppShortcut(db, values, a, packageManager, intent);
added = id >= 0;
@@ -1087,6 +1125,13 @@
values.clear();
values.put(LauncherSettings.Favorites.CONTAINER, folderId);
+ if (LOGD) {
+ final String pkg = ar.getString(R.styleable.Favorite_packageName);
+ final String uri = ar.getString(R.styleable.Favorite_uri);
+ Log.v(TAG, String.format(("%" + (2*(folderDepth+1)) + "s<%s \"%s\">"), "",
+ folder_item_name, uri != null ? uri : pkg));
+ }
+
if (TAG_FAVORITE.equals(folder_item_name) && folderId >= 0) {
long id =
addAppShortcut(db, values, ar, packageManager, intent);
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index b1bb1e8..07b4f6f 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -105,7 +105,6 @@
private int mPreviewBitmapHeight;
private String mSize;
private Context mContext;
- private Launcher mLauncher;
private PackageManager mPackageManager;
private PagedViewCellLayout mWidgetSpacingLayout;
@@ -137,11 +136,11 @@
sInvalidPackages = new HashSet<String>();
}
- public WidgetPreviewLoader(Launcher launcher) {
+ public WidgetPreviewLoader(Context context) {
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
- mContext = mLauncher = launcher;
+ mContext = context;
mPackageManager = mContext.getPackageManager();
mAppIconSize = grid.iconSizePx;
mIconCache = app.getIconCache();
@@ -417,7 +416,7 @@
}
public Bitmap generateWidgetPreview(AppWidgetProviderInfo info, Bitmap preview) {
- int[] cellSpans = Launcher.getSpanForWidget(mLauncher, info);
+ int[] cellSpans = Launcher.getSpanForWidget(mContext, info);
int maxWidth = maxWidthForWidgetPreview(cellSpans[0]);
int maxHeight = maxHeightForWidgetPreview(cellSpans[1]);
return generateWidgetPreview(info.provider, info.previewImage, info.icon,
@@ -469,7 +468,7 @@
.getIntrinsicWidth();
final int previewDrawableHeight = previewDrawable
.getIntrinsicHeight();
- previewWidth = previewDrawableWidth * cellHSpan; // subtract 2 dips
+ previewWidth = previewDrawableWidth * cellHSpan;
previewHeight = previewDrawableHeight * cellVSpan;
defaultPreview = Bitmap.createBitmap(previewWidth, previewHeight,