Merge "Moving power control in default layout" into ics-factoryrom
diff --git a/res/drawable-hdpi/hotseat_bg_panel.9.png b/res/drawable-hdpi/hotseat_bg_panel.9.png
index 3c25e0e..6724b7a 100644
--- a/res/drawable-hdpi/hotseat_bg_panel.9.png
+++ b/res/drawable-hdpi/hotseat_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_container_holo.9.png b/res/drawable-hdpi/portal_container_holo.9.png
index 20e8808..c497612 100644
--- a/res/drawable-hdpi/portal_container_holo.9.png
+++ b/res/drawable-hdpi/portal_container_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png
index 92daaae..477e569 100644
--- a/res/drawable-hdpi/portal_ring_inner_holo.png
+++ b/res/drawable-hdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/search_bg_panel.9.png b/res/drawable-hdpi/search_bg_panel.9.png
index 0c00d36..f2a63f9 100644
--- a/res/drawable-hdpi/search_bg_panel.9.png
+++ b/res/drawable-hdpi/search_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-land-hdpi/hotseat_bg_panel.9.png b/res/drawable-land-hdpi/hotseat_bg_panel.9.png
index 90177f8..c7602cd 100644
--- a/res/drawable-land-hdpi/hotseat_bg_panel.9.png
+++ b/res/drawable-land-hdpi/hotseat_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-land-hdpi/search_bg_panel.9.png b/res/drawable-land-hdpi/search_bg_panel.9.png
index 3642ea5..78f80c9 100644
--- a/res/drawable-land-hdpi/search_bg_panel.9.png
+++ b/res/drawable-land-hdpi/search_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-land-mdpi/hotseat_bg_panel.9.png b/res/drawable-land-mdpi/hotseat_bg_panel.9.png
index 83c4a55..d745bb3 100644
--- a/res/drawable-land-mdpi/hotseat_bg_panel.9.png
+++ b/res/drawable-land-mdpi/hotseat_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-land-mdpi/search_bg_panel.9.png b/res/drawable-land-mdpi/search_bg_panel.9.png
index ce3a7e4..94bcf68 100644
--- a/res/drawable-land-mdpi/search_bg_panel.9.png
+++ b/res/drawable-land-mdpi/search_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png
index 8718040..acbe24a 100644
--- a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png
+++ b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-land-xhdpi/search_bg_panel.9.png b/res/drawable-land-xhdpi/search_bg_panel.9.png
index ca2b365..be3a3e8 100644
--- a/res/drawable-land-xhdpi/search_bg_panel.9.png
+++ b/res/drawable-land-xhdpi/search_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_bg_panel.9.png b/res/drawable-mdpi/hotseat_bg_panel.9.png
index 338db2c..75609d8 100644
--- a/res/drawable-mdpi/hotseat_bg_panel.9.png
+++ b/res/drawable-mdpi/hotseat_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png
index 90fb1d1..30b0fa0 100644
--- a/res/drawable-mdpi/portal_container_holo.9.png
+++ b/res/drawable-mdpi/portal_container_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png
index 4f985a0..eccea20 100644
--- a/res/drawable-mdpi/portal_ring_inner_holo.png
+++ b/res/drawable-mdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/search_bg_panel.9.png b/res/drawable-mdpi/search_bg_panel.9.png
index 0fadc77..615e9a0 100644
--- a/res/drawable-mdpi/search_bg_panel.9.png
+++ b/res/drawable-mdpi/search_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/hotseat_bg_panel.9.png b/res/drawable-xhdpi/hotseat_bg_panel.9.png
index cc3d0bc..748a302 100644
--- a/res/drawable-xhdpi/hotseat_bg_panel.9.png
+++ b/res/drawable-xhdpi/hotseat_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_container_holo.9.png b/res/drawable-xhdpi/portal_container_holo.9.png
index 3c8193b..0935a4b 100644
--- a/res/drawable-xhdpi/portal_container_holo.9.png
+++ b/res/drawable-xhdpi/portal_container_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png
index 229ef96..bc34314 100644
--- a/res/drawable-xhdpi/portal_ring_inner_holo.png
+++ b/res/drawable-xhdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/search_bg_panel.9.png b/res/drawable-xhdpi/search_bg_panel.9.png
index 963cb7f..f080337 100644
--- a/res/drawable-xhdpi/search_bg_panel.9.png
+++ b/res/drawable-xhdpi/search_bg_panel.9.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png b/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png
new file mode 100644
index 0000000..659c23b
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png b/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png
new file mode 100644
index 0000000..8ec67df
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png b/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png
new file mode 100644
index 0000000..8e3dd57
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png b/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png
new file mode 100644
index 0000000..94e0677
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png b/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png
new file mode 100644
index 0000000..a013e5a
--- /dev/null
+++ b/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png b/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png
new file mode 100644
index 0000000..7bdaaf3
--- /dev/null
+++ b/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6b1d47d..8875098 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -85,7 +85,7 @@
<string name="uninstall_system_app_text" msgid="7488523163288397451">"Това е системно приложение и не може да се деинсталира."</string>
<string name="dream_name" msgid="2847171357608437154">"Ракетна площадка"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Папка без име"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Разположете се като у дома си"</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"Настанете се като у дома си"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Тук можете да поставите любимите си приложения."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"За да видите всичките си приложения, докоснете кръга."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Изберете някои приложения"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e6b5257..c7ccf43 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -86,7 +86,7 @@
<string name="dream_name" msgid="2847171357608437154">"Llançamíssils"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Carpeta sense nom"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Posa\'t còmode"</string>
- <!-- outdated translation 4270697827183569326 --> <string name="workspace_cling_move_item" msgid="791013895761065070">"Pots posar les teves aplicacions preferides aquí."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Pots posar les teves aplicacions preferides aquí."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per veure totes les aplicacions, toca el cercle."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Tria algunes aplicacions"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Per afegir una aplicació a la pantalla d\'inici, mantén-la premuda."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c7cdb2a..790700e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -88,7 +88,7 @@
<string name="workspace_cling_title" msgid="738396473989890567">"Føl dig hjemme"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Du kan sætte dine yndlingsapps her."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Tryk på cirklen for at få vist alle dine apps."</string>
- <string name="all_apps_cling_title" msgid="2559734712581447107">"Vælge nogle apps"</string>
+ <string name="all_apps_cling_title" msgid="2559734712581447107">"Vælg nogle apps"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Hvis du vil tilføje en app til startskærmen, skal du trykke på den og holde den nede."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Organiser dine apps med mapper"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Tryk på en app, og hold den nede for at flytte den."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4d02c70..5d328f5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -86,7 +86,7 @@
<string name="dream_name" msgid="2847171357608437154">"Lanzacohetes"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Carpeta sin nombre"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Ponte cómodo."</string>
- <!-- outdated translation 4270697827183569326 --> <string name="workspace_cling_move_item" msgid="791013895761065070">"Puedes colocar tus aplicaciones favoritas aquí."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Puedes colocar tus aplicaciones favoritas aquí."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas las aplicaciones, toca el círculo."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Elige algunas aplicaciones."</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Para agregar una aplicación a tu pantalla principal, tócala & mantenla presionada."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bfe1c87..87c291e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -92,6 +92,6 @@
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Ha egy alkalmazást el szeretne helyezni a kezdőképernyőn, érintse meg, és tartsa lenyomva."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Rendezze alkalmazásait mappákba"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Ha egy alkalmazást át szeretne helyezni, érintse meg, és tartsa lenyomva."</string>
- <string name="folder_cling_create_folder" msgid="289412698047625601">"Ahhoz, hogy egy új mappát hozzon létre a kezdőképernyőn, helyezzen egymásra két alkalmazást."</string>
+ <string name="folder_cling_create_folder" msgid="289412698047625601">"Ha egy új mappát szeretne létrehozni a kezdőképernyőn, helyezzen egymásra két alkalmazást."</string>
<string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d438b2a..7a0caf4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -91,7 +91,7 @@
<string name="all_apps_cling_title" msgid="2559734712581447107">"Pilih beberapa apl"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Untuk menambah apl ke layar utama Anda, sentuh & tahan apl tersebut."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Atur apl Anda dengan map"</string>
- <string name="folder_cling_move_item" msgid="270598675060435169">"Untuk memindah apl, sentuh & tahan apl tersebut."</string>
+ <string name="folder_cling_move_item" msgid="270598675060435169">"Untuk memindahkan apl, sentuh & tahan apl tersebut."</string>
<string name="folder_cling_create_folder" msgid="289412698047625601">"Untuk membuat map baru di layar utama Anda, tumpuk satu apl di atas apl yang lain."</string>
<string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 973cfd9..16a799f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -86,7 +86,7 @@
<string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"名前のないフォルダ"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"ここがあなたのホームです"</string>
- <!-- outdated translation 4270697827183569326 --> <string name="workspace_cling_move_item" msgid="791013895761065070">"お気に入りのアプリをここに置くことができます。"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"お気に入りのアプリをここに置くことができます。"</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"すべてのアプリを見るにはサークルをタップします。"</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"アプリの選択"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"ホーム画面にアプリを追加するにはアプリを押し続けます。"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2964956..a09b0e5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -86,10 +86,10 @@
<string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Dosar fără nume"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Simţiţi-vă ca acasă"</string>
- <!-- outdated translation 4270697827183569326 --> <string name="workspace_cling_move_item" msgid="791013895761065070">"Puteţi plasa aici aplicaţiile preferate."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Puteţi plasa aici aplicaţiile preferate."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Pentru a vedea toate aplicaţiile, atingeţi cercul."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Alegeţi unele aplicaţii"</string>
- <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Pentru a adăuga o aplicaţie la ecranul de pornire, atingeţi şi ţineţi apăsat."</string>
+ <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Pentru a adăuga o aplicaţie pe ecranul de pornire, atingeţi şi ţineţi apăsat."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Organizaţi aplicaţiile în dosare"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Pentru a muta o aplicaţie, atingeţi şi ţineţi apăsat."</string>
<string name="folder_cling_create_folder" msgid="289412698047625601">"Pentru a crea un dosar nou pe ecranul de pornire, plasaţi o aplicaţie deasupra alteia."</string>
diff --git a/res/values-ru-sw600dp/strings.xml b/res/values-ru-sw600dp/strings.xml
index 7835aab..0c5eb41 100644
--- a/res/values-ru-sw600dp/strings.xml
+++ b/res/values-ru-sw600dp/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="wallpaper_dialog_title" msgid="6395005465873616423">"Выбор обоев"</string>
- <string name="wallpaper_chooser_empty" msgid="5909737215399452696">"Нет доступных обоев"</string>
+ <string name="wallpaper_chooser_empty" msgid="5909737215399452696">"Обои недоступны"</string>
<string name="wallpaper_cancel" msgid="1110492200533814461">"Отмена"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 737207d..521057f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -90,7 +90,7 @@
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Чтобы открыть список приложений, нажмите на круг."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Выберите приложения"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Чтобы добавить приложение на главный экран, нажмите на значок и удерживайте его."</string>
- <string name="folder_cling_title" msgid="4308949882377840953">"Упорядочите приложения с помощью папок"</string>
+ <string name="folder_cling_title" msgid="4308949882377840953">"Разложите приложения по папкам"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Чтобы переместить значок приложения, нажмите на него и удерживайте."</string>
<string name="folder_cling_create_folder" msgid="289412698047625601">"Чтобы создать папку на главном экране, перенесите значок одного приложения на значок другого."</string>
<string name="cling_dismiss" msgid="2780907108735868381">"ОК"</string>
