diff options
111 files changed, 1067 insertions, 587 deletions
diff --git a/res/drawable-hdpi/bg_cling1.png b/res/drawable-hdpi/bg_cling1.png Binary files differnew file mode 100644 index 000000000..0e1553299 --- /dev/null +++ b/res/drawable-hdpi/bg_cling1.png diff --git a/res/drawable-hdpi/bg_cling2.png b/res/drawable-hdpi/bg_cling2.png Binary files differnew file mode 100644 index 000000000..e65d9a21c --- /dev/null +++ b/res/drawable-hdpi/bg_cling2.png diff --git a/res/drawable-hdpi/bg_cling3.png b/res/drawable-hdpi/bg_cling3.png Binary files differnew file mode 100644 index 000000000..ea71fbdb3 --- /dev/null +++ b/res/drawable-hdpi/bg_cling3.png diff --git a/res/drawable-hdpi/btn_cling_normal.9.png b/res/drawable-hdpi/btn_cling_normal.9.png Binary files differnew file mode 100644 index 000000000..aea8beb3e --- /dev/null +++ b/res/drawable-hdpi/btn_cling_normal.9.png diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png Binary files differnew file mode 100644 index 000000000..ebefd20ad --- /dev/null +++ b/res/drawable-hdpi/btn_cling_pressed.9.png diff --git a/res/drawable-hdpi/grid_focused.9.png b/res/drawable-hdpi/grid_focused.9.png Binary files differindex cb5aea89a..f6ae2672a 100644 --- a/res/drawable-hdpi/grid_focused.9.png +++ b/res/drawable-hdpi/grid_focused.9.png diff --git a/res/drawable-hdpi/grid_pressed.9.png b/res/drawable-hdpi/grid_pressed.9.png Binary files differindex 548accef6..cb5aea89a 100644 --- a/res/drawable-hdpi/grid_pressed.9.png +++ b/res/drawable-hdpi/grid_pressed.9.png diff --git a/res/drawable-hdpi/grid_selected.9.png b/res/drawable-hdpi/grid_selected.9.png Binary files differindex 02ab90253..add46a73b 100644 --- a/res/drawable-hdpi/grid_selected.9.png +++ b/res/drawable-hdpi/grid_selected.9.png diff --git a/res/drawable-hdpi/hand.png b/res/drawable-hdpi/hand.png Binary files differnew file mode 100644 index 000000000..4a73f2ba7 --- /dev/null +++ b/res/drawable-hdpi/hand.png diff --git a/res/drawable-hdpi/hotseat_bg_panel.9.png b/res/drawable-hdpi/hotseat_bg_panel.9.png Binary files differindex 955b0e830..3c25e0e81 100644 --- a/res/drawable-hdpi/hotseat_bg_panel.9.png +++ b/res/drawable-hdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-hdpi/search_bg_panel.9.png b/res/drawable-hdpi/search_bg_panel.9.png Binary files differindex af5066f04..0c00d364a 100644 --- a/res/drawable-hdpi/search_bg_panel.9.png +++ b/res/drawable-hdpi/search_bg_panel.9.png diff --git a/res/drawable-land-hdpi/hotseat_bg_panel.9.png b/res/drawable-land-hdpi/hotseat_bg_panel.9.png Binary files differindex 318234f64..90177f850 100644 --- a/res/drawable-land-hdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-hdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-hdpi/search_bg_panel.9.png b/res/drawable-land-hdpi/search_bg_panel.9.png Binary files differindex f574e27a9..3642ea54f 100644 --- a/res/drawable-land-hdpi/search_bg_panel.9.png +++ b/res/drawable-land-hdpi/search_bg_panel.9.png diff --git a/res/drawable-land-mdpi/hotseat_bg_panel.9.png b/res/drawable-land-mdpi/hotseat_bg_panel.9.png Binary files differindex 3dbb38610..83c4a552b 100644 --- a/res/drawable-land-mdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-mdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-mdpi/search_bg_panel.9.png b/res/drawable-land-mdpi/search_bg_panel.9.png Binary files differindex e6da3097e..ce3a7e457 100644 --- a/res/drawable-land-mdpi/search_bg_panel.9.png +++ b/res/drawable-land-mdpi/search_bg_panel.9.png diff --git a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png Binary files differindex 5824aa500..8718040c1 100644 --- a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-xhdpi/search_bg_panel.9.png b/res/drawable-land-xhdpi/search_bg_panel.9.png Binary files differindex fdda3cf0d..ca2b3652d 100644 --- a/res/drawable-land-xhdpi/search_bg_panel.9.png +++ b/res/drawable-land-xhdpi/search_bg_panel.9.png diff --git a/res/drawable-mdpi/bg_cling1.png b/res/drawable-mdpi/bg_cling1.png Binary files differnew file mode 100644 index 000000000..f284412a7 --- /dev/null +++ b/res/drawable-mdpi/bg_cling1.png diff --git a/res/drawable-mdpi/bg_cling2.png b/res/drawable-mdpi/bg_cling2.png Binary files differnew file mode 100644 index 000000000..0052dc29d --- /dev/null +++ b/res/drawable-mdpi/bg_cling2.png diff --git a/res/drawable-mdpi/bg_cling3.png b/res/drawable-mdpi/bg_cling3.png Binary files differnew file mode 100644 index 000000000..fabdf7a0d --- /dev/null +++ b/res/drawable-mdpi/bg_cling3.png diff --git a/res/drawable-mdpi/btn_cling_normal.9.png b/res/drawable-mdpi/btn_cling_normal.9.png Binary files differnew file mode 100644 index 000000000..43a407e03 --- /dev/null +++ b/res/drawable-mdpi/btn_cling_normal.9.png diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png Binary files differnew file mode 100644 index 000000000..bf0c8cbb4 --- /dev/null +++ b/res/drawable-mdpi/btn_cling_pressed.9.png diff --git a/res/drawable-mdpi/grid_focused.9.png b/res/drawable-mdpi/grid_focused.9.png Binary files differindex c7e6b06da..6660a8c18 100644 --- a/res/drawable-mdpi/grid_focused.9.png +++ b/res/drawable-mdpi/grid_focused.9.png diff --git a/res/drawable-mdpi/grid_pressed.9.png b/res/drawable-mdpi/grid_pressed.9.png Binary files differindex 09a7e3fbe..c7e6b06da 100644 --- a/res/drawable-mdpi/grid_pressed.9.png +++ b/res/drawable-mdpi/grid_pressed.9.png diff --git a/res/drawable-mdpi/grid_selected.9.png b/res/drawable-mdpi/grid_selected.9.png Binary files differindex a40b05826..e2732b770 100644 --- a/res/drawable-mdpi/grid_selected.9.png +++ b/res/drawable-mdpi/grid_selected.9.png diff --git a/res/drawable-mdpi/hand.png b/res/drawable-mdpi/hand.png Binary files differnew file mode 100644 index 000000000..eb280e328 --- /dev/null +++ b/res/drawable-mdpi/hand.png diff --git a/res/drawable-mdpi/hotseat_bg_panel.9.png b/res/drawable-mdpi/hotseat_bg_panel.9.png Binary files differindex 7c31ee2c8..338db2c61 100644 --- a/res/drawable-mdpi/hotseat_bg_panel.9.png +++ b/res/drawable-mdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-mdpi/search_bg_panel.9.png b/res/drawable-mdpi/search_bg_panel.9.png Binary files differindex 277d2ce7b..0fadc7754 100644 --- a/res/drawable-mdpi/search_bg_panel.9.png +++ b/res/drawable-mdpi/search_bg_panel.9.png diff --git a/res/drawable-xhdpi/bg_cling1.png b/res/drawable-xhdpi/bg_cling1.png Binary files differnew file mode 100644 index 000000000..b71351a32 --- /dev/null +++ b/res/drawable-xhdpi/bg_cling1.png diff --git a/res/drawable-xhdpi/bg_cling2.png b/res/drawable-xhdpi/bg_cling2.png Binary files differnew file mode 100644 index 000000000..ad78dfeb0 --- /dev/null +++ b/res/drawable-xhdpi/bg_cling2.png diff --git a/res/drawable-xhdpi/bg_cling3.png b/res/drawable-xhdpi/bg_cling3.png Binary files differnew file mode 100644 index 000000000..ae04195c4 --- /dev/null +++ b/res/drawable-xhdpi/bg_cling3.png diff --git a/res/drawable-xhdpi/btn_cling_normal.9.png b/res/drawable-xhdpi/btn_cling_normal.9.png Binary files differnew file mode 100644 index 000000000..35511d6f9 --- /dev/null +++ b/res/drawable-xhdpi/btn_cling_normal.9.png diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png Binary files differnew file mode 100644 index 000000000..a38b40fa9 --- /dev/null +++ b/res/drawable-xhdpi/btn_cling_pressed.9.png diff --git a/res/drawable-xhdpi/grid_focused.9.png b/res/drawable-xhdpi/grid_focused.9.png Binary files differindex 20d4647df..37228b341 100644 --- a/res/drawable-xhdpi/grid_focused.9.png +++ b/res/drawable-xhdpi/grid_focused.9.png diff --git a/res/drawable-xhdpi/grid_pressed.9.png b/res/drawable-xhdpi/grid_pressed.9.png Binary files differindex 73a784b60..20d4647df 100644 --- a/res/drawable-xhdpi/grid_pressed.9.png +++ b/res/drawable-xhdpi/grid_pressed.9.png diff --git a/res/drawable-xhdpi/grid_selected.9.png b/res/drawable-xhdpi/grid_selected.9.png Binary files differindex eb0f3dc2f..c8b9b6b2c 100644 --- a/res/drawable-xhdpi/grid_selected.9.png +++ b/res/drawable-xhdpi/grid_selected.9.png diff --git a/res/drawable-xhdpi/hand.png b/res/drawable-xhdpi/hand.png Binary files differnew file mode 100644 index 000000000..aaaad3792 --- /dev/null +++ b/res/drawable-xhdpi/hand.png diff --git a/res/drawable-xhdpi/hotseat_bg_panel.9.png b/res/drawable-xhdpi/hotseat_bg_panel.9.png Binary files differindex 570d929c2..cc3d0bc47 100644 --- a/res/drawable-xhdpi/hotseat_bg_panel.9.png +++ b/res/drawable-xhdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-xhdpi/search_bg_panel.9.png b/res/drawable-xhdpi/search_bg_panel.9.png Binary files differindex 5f007c973..963cb7ff4 100644 --- a/res/drawable-xhdpi/search_bg_panel.9.png +++ b/res/drawable-xhdpi/search_bg_panel.9.png diff --git a/res/drawable/cling_button_bg.xml b/res/drawable/cling_button_bg.xml index 791250b7d..3809cdecb 100644 --- a/res/drawable/cling_button_bg.xml +++ b/res/drawable/cling_button_bg.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@color/cling_button_pressed" /> - <item android:drawable="@color/cling_button" /> + <item android:state_pressed="true" android:drawable="@drawable/btn_cling_pressed" /> + <item android:drawable="@drawable/btn_cling_normal" /> </selector> diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml index 95d88b00c..e89d4c178 100644 --- a/res/layout-land/all_apps_cling.xml +++ b/res/layout-land/all_apps_cling.xml @@ -16,29 +16,33 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="all_apps_landscape" - android:background="#CA000000"> + launcher:drawIdentifier="all_apps_landscape"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="20dp" - android:layout_marginTop="50dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:layout_marginTop="0dp" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="280dp" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="45dp" - android:text="@string/all_apps_cling_add_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="100dp" - android:onClick="dismissAllAppsCling" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/all_apps_cling_title" + android:text="@string/all_apps_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/all_apps_cling_add_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_add_item" /> + </LinearLayout> </FrameLayout> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissAllAppsCling" /> </com.android.launcher2.Cling> diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml new file mode 100644 index 000000000..91d34ad03 --- /dev/null +++ b/res/layout-land/folder_cling.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="folder_landscape"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/folder_cling_move_item" /> + </LinearLayout> + </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="340dp" + android:layout_height="wrap_content" + android:layout_marginLeft="40dp" + android:layout_marginBottom="40dp" + android:layout_gravity="bottom" + android:text="@string/folder_cling_create_folder" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissFolderCling" /> +</com.android.launcher2.Cling> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 2b25bbb70..084b1636a 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -87,4 +87,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> + + <include layout="@layout/folder_cling" + android:id="@+id/folder_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> </com.android.launcher2.DragLayer> diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index fa8550760..dca393727 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/workspace_cling.xml @@ -16,36 +16,42 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="workspace_landscape" - android:background="#AA000000"> + launcher:drawIdentifier="workspace_landscape"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="20dp" - android:layout_marginTop="20dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="0dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="285dp" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="50dp" - android:text="@string/workspace_cling_move_item" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" - android:layout_width="200dp" - android:layout_height="wrap_content" - android:layout_marginTop="100dp" - android:text="@string/workspace_cling_open_all_apps" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="160dp" - android:onClick="dismissWorkspaceCling" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/workspace_cling_title" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + </LinearLayout> </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_open_all_apps" + android:layout_width="180dp" + android:layout_height="wrap_content" + android:layout_marginRight="130dp" + android:layout_gravity="right|center_vertical" + android:gravity="right" + android:text="@string/workspace_cling_open_all_apps" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissWorkspaceCling" /> </com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml index cd702ed1a..e0dcf8165 100644 --- a/res/layout-port/all_apps_cling.xml +++ b/res/layout-port/all_apps_cling.xml @@ -16,30 +16,33 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="all_apps_portrait" - android:background="#CA000000"> + launcher:drawIdentifier="all_apps_portrait"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="20dp" - android:layout_marginTop="50dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:layout_marginTop="0dp" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="280dp" + android:layout_marginTop="90dp"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="45dp" - android:text="@string/all_apps_cling_add_item" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/all_apps_cling_title" + android:text="@string/all_apps_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/all_apps_cling_add_item" + android:layout_width="285dp" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_add_item" /> + </LinearLayout> </FrameLayout> <Button style="@style/ClingButton" android:id="@+id/cling_dismiss" - android:layout_marginBottom="40dp" - android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" android:onClick="dismissAllAppsCling" /> </com.android.launcher2.Cling> diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml new file mode 100644 index 000000000..d2374bf61 --- /dev/null +++ b/res/layout-port/folder_cling.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="folder_portrait"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="20dp" + android:layout_marginTop="100dp"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_move_item" + android:layout_width="285dp" + android:layout_height="wrap_content" + android:text="@string/folder_cling_move_item" /> + </LinearLayout> + </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="65dp" + android:layout_gravity="bottom" + android:text="@string/folder_cling_create_folder" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissFolderCling" /> +</com.android.launcher2.Cling> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 963770076..061d8e39b 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -81,4 +81,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> + + <include layout="@layout/folder_cling" + android:id="@+id/folder_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> </com.android.launcher2.DragLayer> diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index 8c4a0b3b0..6b05c2705 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -16,36 +16,45 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="workspace_portrait" - android:background="#AA000000"> + launcher:drawIdentifier="workspace_portrait"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" android:layout_marginTop="90dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="0dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="285dp" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="50dp" - android:text="@string/workspace_cling_move_item" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" - android:layout_width="200dp" - android:layout_height="wrap_content" - android:layout_marginTop="100dp" - android:text="@string/workspace_cling_open_all_apps" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="160dp" - android:onClick="dismissWorkspaceCling" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/workspace_cling_title" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + </LinearLayout> </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_open_all_apps" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="130dp" + android:layout_gravity="bottom" + android:gravity="center" + android:text="@string/workspace_cling_open_all_apps" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissWorkspaceCling" /> </com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 75b0e7ba8..27f2efea6 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -62,6 +62,8 @@ launcher:widgetCellHeightGap="@dimen/apps_customize_widget_cell_height_gap" launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" + launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" + launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" launcher:maxGap="@dimen/workspace_max_gap" /> <ImageView android:id="@+id/animation_buffer" diff --git a/res/layout/wallpaper_chooser.xml b/res/layout/wallpaper_chooser.xml index 60d971907..49930769c 100644 --- a/res/layout/wallpaper_chooser.xml +++ b/res/layout/wallpaper_chooser.xml @@ -32,7 +32,7 @@ <Gallery android:id="@+id/gallery" android:layout_width="match_parent" android:layout_height="wrap_content" - android:spacing="0dp" /> + android:spacing="-4dp" /> <Button android:id="@+id/set" android:layout_width="wrap_content" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 9be21f9d4..4b74c0344 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie."</string> <string name="dream_name" msgid="2847171357608437154">"Vuurpyllanseerder"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Naamlose vouer"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Welkom tuis!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Om \'n program of legstuk te beweeg, raak & hou dit, herposisioneer dit dan."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Om al jou programme te sien, raak die All Apps-knoppie."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Hier is al jou programme"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Om \'n program of legstuk op jou tuisskerm te voeg, raak & hou dit en posisioneer dit dan."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Welkom tuis!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Om \'n program of legstuk te beweeg, raak & hou dit, herposisioneer dit dan."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Om al jou programme te sien, raak die All Apps-knoppie."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Hier is al jou programme"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Om \'n program of legstuk op jou tuisskerm te voeg, raak & hou dit en posisioneer dit dan."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 0cfe13029..9068b1bdc 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -85,10 +85,17 @@ <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="6772061635561632299">"እንኳን ወደ መነሻ ገጽ መጣህ!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"መተግበሪያ ወይም አነስተኛ ምርት ለማንቀሳቀስ፣ ንካ & ያዝ፣ ከዛ ዳግም ቦታውን አመጣጥነው፡፡"</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"ሁሉንም ያንተ መተግበሪያዎች ለማየት፣ ሁሉንም መተግበሪያዎች አዝራር ንካ::"</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"እነሆ ሁሉም መተግበሪያዎችህ"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"ወደ መነሻ መታያ ገጽህ መተግበሪያ ወይም አነስተኛ ምርት ለማከል፣ ንካ & ያዝ፣ ከዛ ቦታውን አመጣጥነው፡፡"</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"እንኳን ወደ መነሻ ገጽ መጣህ!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"መተግበሪያ ወይም አነስተኛ ምርት ለማንቀሳቀስ፣ ንካ &amp; ያዝ፣ ከዛ ዳግም ቦታውን አመጣጥነው፡፡"</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"ሁሉንም ያንተ መተግበሪያዎች ለማየት፣ ሁሉንም መተግበሪያዎች አዝራር ንካ::"</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"እነሆ ሁሉም መተግበሪያዎችህ"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"ወደ መነሻ መታያ ገጽህ መተግበሪያ ወይም አነስተኛ ምርት ለማከል፣ ንካ & ያዝ፣ ከዛ ቦታውን አመጣጥነው፡፡"</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"እሺ"</string> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 9c7291aae..a4cbae948 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -85,10 +85,16 @@ <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="6772061635561632299">"مرحبًا بك في الشاشة الرئيسية!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"لنقل تطبيق أو أداة، المس مع الاستمرار، ثم أعد تحديد موضعه."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"للاطلاع على جميع التطبيقات، المس الزر \"جميع التطبيقات\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"إليك جميع التطبيقات"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"لإضافة تطبيق أو أداة إلى الشاشة الرئيسية، المس مع الاستمرار، ثم حدد موضعه."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"مرحبًا بك في الشاشة الرئيسية!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"لنقل تطبيق أو أداة، المس مع الاستمرار، ثم أعد تحديد موضعه."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"للاطلاع على جميع التطبيقات، المس الزر \"جميع التطبيقات\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"إليك جميع التطبيقات"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"لإضافة تطبيق أو أداة إلى الشاشة الرئيسية، المس مع الاستمرار، ثم حدد موضعه."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"موافق"</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index eba6d15ff..ccc3230f2 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Разрешава на приложение да прочете настройките и преките пътища към „Начало“."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"въведете настройките за „Начало“ и преки пътища"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Разрешава на приложение да промени настройките и преките пътища в „Начало“."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Приложения"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Проблем при зареждане на приспособление"</string> <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="6772061635561632299">"Добре дошли в началото!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"За да преместите приложение или приспособление, го докоснете и задръжте, след което го позиционирайте отново."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"За да видите всичките си приложения, докоснете бутона „Всички приложения“."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Това са всичките ви приложения"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"За да добавите приложение или приспособление към началния си екран, го докоснете и задръжте, след което го позиционирайте."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Добре дошли в началото!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"За да преместите приложение или приспособление, го докоснете и задръжте, след което го позиционирайте отново."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"За да видите всичките си приложения, докоснете бутона „Всички приложения“."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Това са всичките ви приложения"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"За да добавите приложение или приспособление към началния си екран, го докоснете и задръжте, след което го позиционирайте."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 413f48af7..d4323a96b 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Això és una aplicació del sistema i no es pot desinstal·lar."</string> <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="6772061635561632299">"Benvingut a la pàgina d\'inici."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Per moure una aplicació o un widget, mantén-lo premut i col·loca\'l on vulguis."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Per veure totes les aplicacions, toca el botó \"Totes les aplicacions\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Aquí hi ha totes les aplicacions"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Per afegir una aplicació o un widget a la pantalla d\'inici, mantén-lo premut i col·loca\'l on vulguis."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Benvingut a la pàgina d\'inici."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Per moure una aplicació o un widget, mantén-lo premut i col·loca\'l on vulguis."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per veure totes les aplicacions, toca el botó \"Totes les aplicacions\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Aquí hi ha totes les aplicacions"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Per afegir una aplicació o un widget a la pantalla d\'inici, mantén-lo premut i col·loca\'l on vulguis."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"D\'acord"</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 653cac4f8..e6a6cd256 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikace a nelze ji odinstalovat."</string> <string name="dream_name" msgid="2847171357608437154">"Raketomet"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Složka bez názvu"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Vítejte na ploše."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Chcete-li aplikaci nebo widget přesunout, dotkněte se jej, podržte na něm prst a následně změňte jeho umístění."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Chcete-li zobrazit všechny aplikace, dotkněte se tlačítka Všechny aplikace."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Zde se nachází všechny vaše aplikace"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Chcete-li na plochu přidat aplikaci nebo widget, dotkněte se jej, podržte na něm prst a následně jej umístěte."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Vítejte na ploše."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Chcete-li aplikaci nebo widget přesunout, dotkněte se jej, podržte na něm prst a následně změňte jeho umístění."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Chcete-li zobrazit všechny aplikace, dotkněte se tlačítka Všechny aplikace."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Zde se nachází všechny vaše aplikace"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Chcete-li na plochu přidat aplikaci nebo widget, dotkněte se jej, podržte na něm prst a následně jej umístěte."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 1c028ff7a..7bf9e9d4f 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram, som ikke kan afinstalleres."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Unavngiven mappe"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Velkommen hjem!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Du kan flytte en app eller widget ved at trykke på den, holde den inde og derefter placere den."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Få vist alle dine apps ved at trykke på knappen Alle apps."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Her er alle dine apps"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Du kan tilføje en app eller widget på startskærmen ved at trykke på den, holde den nede og derefter placere den."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Velkommen hjem!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Du kan flytte en app eller widget ved at trykke på den, holde den inde og derefter placere den."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Få vist alle dine apps ved at trykke på knappen Alle apps."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Her er alle dine apps"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Du kan tilføje en app eller widget på startskærmen ved at trykke på den, holde den nede og derefter placere den."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index df26d79d7..2f60467b3 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Ermöglicht einer App, die Einstellungen und Shortcuts auf der Startseite zu lesen."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"Einstellungen und Shortcuts für Startseite schreiben"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Ermöglicht einer App, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string> <string name="dream_name" msgid="2847171357608437154">"Raketenstartgerät"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Unbenannter Ordner"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Willkommen!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Zum Verschieben einer App zu Ihrem Startbildschirm berühren und halten Sie diese und positionieren sie an der gewünschten Stelle. Dieser Vorgang ist auch für Widgets möglich."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Berühren Sie zum Anzeigen aller Ihrer Apps die Schaltfläche \"Alle Apps\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Hier sind alle Ihre Apps"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Zum Hinzufügen einer App zu Ihrem Startbildschirm berühren und halten Sie diese und positionieren sie. Dieser Vorgang ist auch für Widgets möglich."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Willkommen!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Zum Verschieben einer App zu Ihrem Startbildschirm berühren und halten Sie diese und positionieren sie an der gewünschten Stelle. Dieser Vorgang ist auch für Widgets möglich."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Berühren Sie zum Anzeigen aller Ihrer Apps die Schaltfläche \"Alle Apps\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Hier sind alle Ihre Apps"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Zum Hinzufügen einer App zu Ihrem Startbildschirm berühren und halten Sie diese und positionieren sie. Dieser Vorgang ist auch für Widgets möglich."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 4909b3f46..d567ac754 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Αυτή είναι εφαρμογή του συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Φάκελος χωρίς όνομα"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Καλώς ορίσατε!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Για να μετακινήσετε μια εφαρμογή ή γραφικό στοιχείο, πατήστε παρατεταμένα και τοποθετήστε το εκεί που θέλετε."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Για να δείτε όλες τις εφαρμογές σας, πατήστε το κουμπί \"Όλες οι εφαρμογές\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Εδώ θα βρείτε όλες τις εφαρμογές σας"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Για να προσθέσετε μια εφαρμογή ή ένα γραφικό στοιχείο στην αρχική οθόνη, πατήστε παρατεταμένα και, στη συνέχεια, τοποθετήστε το."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Καλώς ορίσατε!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Για να μετακινήσετε μια εφαρμογή ή γραφικό στοιχείο, πατήστε παρατεταμένα και τοποθετήστε το εκεί που θέλετε."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Για να δείτε όλες τις εφαρμογές σας, πατήστε το κουμπί \"Όλες οι εφαρμογές\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Εδώ θα βρείτε όλες τις εφαρμογές σας"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Για να προσθέσετε μια εφαρμογή ή ένα γραφικό στοιχείο στην αρχική οθόνη, πατήστε παρατεταμένα και, στη συνέχεια, τοποθετήστε το."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 7f3766fe1..4d236eba5 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -85,10 +85,17 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"This is a system application and cannot be uninstalled."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Unnamed Folder"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Welcome Home!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"To move an app or widget, touch & hold, then reposition it."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"To see all your apps, touch the All Apps button."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Here are all your apps"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"To add an app or widget to your home screen, touch & hold, then position it."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Welcome Home!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"To move an app or widget, touch &amp; hold, then reposition it."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"To see all your apps, touch the All Apps button."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Here are all your apps"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"To add an app or widget to your home screen, touch & hold, then position it."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 8c360491e..02a912499 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite a una aplicación leer la configuración y los accesos directos de la página principal."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"escribir configuración y accesos directos de la página principal"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite a una aplicación cambiar la configuración y los accesos directos de la página principal."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Esta es una aplicación de sistema y no puede desinstalarse."</string> <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="6772061635561632299">"¡Bienvenido a casa!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Para mover una aplicación o un widget, tócalo y mantenlo presionado, a continuación cambia su posición."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Para ver todas las aplicaciones, toca el botón Todas las aplicaciones."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Aquí están todas tus aplicaciones."</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Para agregar una aplicación o un widget a la página principal, tócalo y mantenlo presionado, y luego ubícalo."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"¡Bienvenido a casa!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Para mover una aplicación o un widget, tócalo y mantenlo presionado, a continuación cambia su posición."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas las aplicaciones, toca el botón Todas las aplicaciones."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Aquí están todas tus aplicaciones."</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Para agregar una aplicación o un widget a la página principal, tócalo y mantenlo presionado, y luego ubícalo."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Aceptar"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 4b2205474..1acb4dd4e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Se trata de una aplicación del sistema y no se puede desinstalar."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Carpeta sin nombre"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Te damos la bienvenida"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Para mover una aplicación o un widget, mantenlo pulsado y, a continuación, muévelo."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Para ver todas las aplicaciones, toca el botón Todas las aplicaciones."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Todas tus aplicaciones"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Para añadir una aplicación o un widget al escritorio, mantenlo pulsado y, a continuación, colócalo donde quieras."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Te damos la bienvenida"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Para mover una aplicación o un widget, mantenlo pulsado y, a continuación, muévelo."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas las aplicaciones, toca el botón Todas las aplicaciones."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Todas tus aplicaciones"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Para añadir una aplicación o un widget al escritorio, mantenlo pulsado y, a continuación, colócalo donde quieras."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Aceptar"</string> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 20342ce52..52ed2dfb0 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -85,10 +85,16 @@ <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="6772061635561632299">"به خانه خوش آمدید!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"برای انتقال ابزارک یا برنامه، لمس کرده و نگه دارید، سپس دوباره آن را در جای خود قرار دهید."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"برای دیدن تمام برنامههای خود، دکمه همه برنامهها را لمس کنید."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"در اینجا تمام برنامههای شما قرار دارد"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"برای اضافه کردن برنامه یا ابزارک به صفحه اصلی خود، لمس کرده و نگه دارید، سپس جای آن را مشخص کنید."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"به خانه خوش آمدید!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"برای انتقال ابزارک یا برنامه، لمس کرده و نگه دارید، سپس دوباره آن را در جای خود قرار دهید."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"برای دیدن تمام برنامههای خود، دکمه همه برنامهها را لمس کنید."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"در اینجا تمام برنامههای شما قرار دارد"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"برای اضافه کردن برنامه یا ابزارک به صفحه اصلی خود، لمس کرده و نگه دارید، سپس جای آن را مشخص کنید."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"تأیید"</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 357c4efe2..aa758063e 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Tämä on järjestelmäsovellus, eikä sitä voi poistaa."</string> <string name="dream_name" msgid="2847171357608437154">"Sinko"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Nimetön kansio"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Tervetuloa aloitusruutuun."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Voit siirtää sovellusta tai widgetiä koskettamalla sitä pitkään ja siirtämällä sen haluamaasi kohtaan."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Näet kaikki sovelluksesi koskettamalla Kaikki sovellukset -painiketta."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Tässä ovat kaikki sovelluksesi"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Voit lisätä sovelluksen tai widgetin aloitusruutuusi koskettamalla sitä pitkään ja sijoittamalla sen haluamaasi kohtaan."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Tervetuloa aloitusruutuun."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Voit siirtää sovellusta tai widgetiä koskettamalla sitä pitkään ja siirtämällä sen haluamaasi kohtaan."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Näet kaikki sovelluksesi koskettamalla Kaikki sovellukset -painiketta."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Tässä ovat kaikki sovelluksesi"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Voit lisätä sovelluksen tai widgetin aloitusruutuusi koskettamalla sitä pitkään ja sijoittamalla sen haluamaasi kohtaan."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4159d60d3..e03752345 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Il s\'agit d\'une application système que vous ne pouvez pas désinstaller."</string> <string name="dream_name" msgid="2847171357608437154">"Lance-missile"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Dossier sans nom"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Bienvenue sur la page d\'accueil !"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Pour déplacer une application ou un widget, appuyez sur l\'élément sélectionné de manière prolongée, puis repositionnez-le."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Pour voir toutes vos applications, appuyez sur le bouton \"Toutes les applications\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Voici toutes vos applications"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Pour ajouter une application ou un widget à votre écran d\'accueil, appuyez sur l\'élément sélectionné de manière prolongée, puis positionnez-le."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Bienvenue sur la page d\'accueil !"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Pour déplacer une application ou un widget, appuyez sur l\'élément sélectionné de manière prolongée, puis repositionnez-le."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Pour voir toutes vos applications, appuyez sur le bouton \"Toutes les applications\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Voici toutes vos applications"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Pour ajouter une application ou un widget à votre écran d\'accueil, appuyez sur l\'élément sélectionné de manière prolongée, puis positionnez-le."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 807d8c398..e023cb313 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ovo je aplikacija sustava i ne može se ukloniti."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Neimenovana mapa"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Dobro došli na početnu stranicu!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Da biste premjestili aplikaciju ili widget, dodirnite ih i zadržite, a zatim ih premjestite."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Da biste vidjeli sve svoje aplikacije, dodirnite gumb Sve aplikacije."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Ovdje su sve vaše aplikacije"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Da biste početnom zaslonu dodali neku aplikaciju ili widget, dodirnite i zadržite tu stavku, a zatim je postavite na željeno mjesto."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Dobro došli na početnu stranicu!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Da biste premjestili aplikaciju ili widget, dodirnite ih i zadržite, a zatim ih premjestite."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Da biste vidjeli sve svoje aplikacije, dodirnite gumb Sve aplikacije."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Ovdje su sve vaše aplikacije"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Da biste početnom zaslonu dodali neku aplikaciju ili widget, dodirnite i zadržite tu stavku, a zatim je postavite na željeno mjesto."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"U redu"</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index fb16b0a06..48dd12ee5 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ez egy rendszeralkalmazás, ezért nem lehet eltávolítani."</string> <string name="dream_name" msgid="2847171357608437154">"Aknavető"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Névtelen mappa"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Üdvözöljük a főoldalon!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Ha egy alkalmazást vagy egy modult át szeretne helyezni, érintse meg és tartsa lenyomva, majd helyezze át a kívánt helyre."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Az összes saját alkalmazás megtekintéséhez érintse meg a \"Minden alkalmazás\" gombot."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Íme az összes alkalmazása"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Ha egy alkalmazást vagy egy modult el szeretne helyezni a főoldalon, érintse meg és tartsa lenyomva, majd helyezze a kívánt helyre."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Üdvözöljük a főoldalon!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Ha egy alkalmazást vagy egy modult át szeretne helyezni, érintse meg és tartsa lenyomva, majd helyezze át a kívánt helyre."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Az összes saját alkalmazás megtekintéséhez érintse meg a \"Minden alkalmazás\" gombot."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Íme az összes alkalmazása"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Ha egy alkalmazást vagy egy modult el szeretne helyezni a főoldalon, érintse meg és tartsa lenyomva, majd helyezze a kívánt helyre."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index d13823bd9..6c093657a 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -85,10 +85,17 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ini adalah aplikasi sistem dan tidak dapat diunduh."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Map Tanpa Nama"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Selamat Datang di layar Utama!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Untuk memindahkan apl atau gawit, sentuh & tahan, kemudian pindahkan posisinya."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Untuk melihat semua apl Anda, sentuh tombol Semua Apl."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Berikut adalah semua apl Anda"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Untuk menambahkan apl atau gawit ke layar utama Anda, sentuh & tahan, lalu letakkan di posisinya."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Selamat Datang di layar Utama!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Untuk memindahkan apl atau gawit, sentuh &amp; tahan, kemudian pindahkan posisinya."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Untuk melihat semua apl Anda, sentuh tombol Semua Apl."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Berikut adalah semua apl Anda"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Untuk menambahkan apl atau gawit ke layar utama Anda, sentuh & tahan, lalu letakkan di posisinya."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index dbd9abc0c..2ed587e5d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Questa è un\'applicazione di sistema e non può essere disinstallata."</string> <string name="dream_name" msgid="2847171357608437154">"Lanciamissili"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Cartella senza nome"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Benvenuto nella schermata Home."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Per spostare un\'applicazione o un widget, tocca l\'elemento e tieni premuto, quindi riposizionalo."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Per visualizzare tutte le tue applicazioni, tocca il pulsante Tutte le app."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Qui ci sono tutte le tue applicazioni"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Per aggiungere un\'applicazione o un widget alla schermata Home, tocca l\'elemento e tieni premuto, quindi posizionalo."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Benvenuto nella schermata Home."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Per spostare un\'applicazione o un widget, tocca l\'elemento e tieni premuto, quindi riposizionalo."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per visualizzare tutte le tue applicazioni, tocca il pulsante Tutte le app."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Qui ci sono tutte le tue applicazioni"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Per aggiungere un\'applicazione o un widget alla schermata Home, tocca l\'elemento e tieni premuto, quindi posizionalo."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 3f2914909..f9c237f5f 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"זהו יישום מערכת ואין אפשרות להסיר את התקנתו."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"תיקיה ללא שם"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"ברוכים הבאים אל דף הבית!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"כדי להעביר יישום או רכיב widget, גע והחזק בו ולאחר מכן מקם אותו."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"כדי לראות את כל היישומים, גע בלחצן \'כל היישומים\'."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"הנה כל היישומים שלך"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"כדי להוסיף יישום או רכיב widget למסך דף הבית, גע והחזק בו ולאחר מכן מקם אותו."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"ברוכים הבאים אל דף הבית!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"כדי להעביר יישום או רכיב widget, גע והחזק בו ולאחר מכן מקם אותו."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"כדי לראות את כל היישומים, גע בלחצן \'כל היישומים\'."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"הנה כל היישומים שלך"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"כדי להוסיף יישום או רכיב widget למסך דף הבית, גע והחזק בו ולאחר מכן מקם אותו."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"בסדר"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9385101bd..d51286849 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"ホームの設定とショートカットの読み取りをアプリケーションに許可します。"</string> <string name="permlab_write_settings" msgid="1360567537236705628">"ホームの設定とショートカットの書き込み"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"ウィジェットを表示できません"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"このシステムアプリケーションはアンインストールできません。"</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"名前のないフォルダ"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"ホーム画面へようこそ。"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"アプリまたはウィジェットを移動するには、アプリまたはウィジェットを押し続けた後、新しい場所に配置します。"</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"すべてのアプリを見るには、[すべてのアプリ]をタップします。"</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"全アプリを表示しています"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"ホーム画面にアプリまたはウィジェットを追加するには、アプリまたはウィジェットを押し続けた後、希望の場所に配置します。"</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"ホーム画面へようこそ。"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"アプリまたはウィジェットを移動するには、アプリまたはウィジェットを押し続けた後、新しい場所に配置します。"</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"すべてのアプリを見るには、[すべてのアプリ]をタップします。"</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"全アプリを表示しています"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"ホーム画面にアプリまたはウィジェットを追加するには、アプリまたはウィジェットを押し続けた後、希望の場所に配置します。"</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 8ad9fe18c..2d1dd4cfc 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -85,10 +85,16 @@ <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="6772061635561632299">"홈에 오신 것을 환영합니다."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"앱이나 위젯을 이동하려면 해당 앱이나 위젯을 길게 터치한 다음 위치를 변경합니다."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"전체 앱을 보려면 \'모든 앱\' 버튼을 터치합니다."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"전체 앱"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"홈 화면에 앱이나 위젯을 추가하려면 해당 앱이나 위젯을 길게 터치한 다음 원하는 위치에 배치합니다."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"홈에 오신 것을 환영합니다."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"앱이나 위젯을 이동하려면 해당 앱이나 위젯을 길게 터치한 다음 위치를 변경합니다."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"전체 앱을 보려면 \'모든 앱\' 버튼을 터치합니다."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"전체 앱"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"홈 화면에 앱이나 위젯을 추가하려면 해당 앱이나 위젯을 길게 터치한 다음 원하는 위치에 배치합니다."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"확인"</string> </resources> diff --git a/res/values-land/config.xml b/res/values-land/config.xml index cbc0a6eda..121bb0c14 100644 --- a/res/values-land/config.xml +++ b/res/values-land/config.xml @@ -20,8 +20,4 @@ <bool name="config_useDropTargetDownTransition">false</bool> <!-- Whether or not to fade the side pages --> <bool name="config_workspaceFadeAdjacentScreens">false</bool> - - <!-- Padding applied to AppWidgets --> - <dimen name="app_widget_padding_top">8dp</dimen> - <dimen name="app_widget_padding_bottom">8dp</dimen> </resources> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 52c52f18b..4bb64f71d 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -64,6 +64,12 @@ <dimen name="apps_customize_widget_cell_height_gap">5dp</dimen> <integer name="apps_customize_widget_cell_count_x">3</integer> <integer name="apps_customize_widget_cell_count_y">2</integer> + <integer name="apps_customize_cling_focused_x">2</integer> + <integer name="apps_customize_cling_focused_y">1</integer> + + <!-- Padding applied to AppWidgets --> + <dimen name="app_widget_padding_top">8dp</dimen> + <dimen name="app_widget_padding_bottom">8dp</dimen> <!-- Folders --> <!-- The size of the image which sits behind the preview of the folder contents --> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f032c0c9b..8f43cddff 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Tai sistemos programa ir jos negalima pašalinti."</string> <string name="dream_name" msgid="2847171357608437154">"Raketinis prieštankinis šautuvas"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Aplankas be pavadinimo"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Sveiki sugrįžę į pagrindinį ekraną!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Jei norite perkelti programą ar valdiklį, palieskite ir laikykite, tada iš naujo nustatykite jų padėtį."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Jei norite matyti visas programas, palieskite mygtuką „Visos programos“."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Čia pateikiamos visos jūsų programos"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Jei norite prie pagrindinio ekrano pridėti programą ar valdiklį, palieskite ir laikykite, tada nustatykite jų padėtį."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Sveiki sugrįžę į pagrindinį ekraną!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Jei norite perkelti programą ar valdiklį, palieskite ir laikykite, tada iš naujo nustatykite jų padėtį."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Jei norite matyti visas programas, palieskite mygtuką „Visos programos“."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Čia pateikiamos visos jūsų programos"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Jei norite prie pagrindinio ekrano pridėti programą ar valdiklį, palieskite ir laikykite, tada nustatykite jų padėtį."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Gerai"</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index e8040773f..51ca82d85 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Šī ir sistēmas lietojumprogramma un to nevar atinstalēt."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Mape bez nosaukuma"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Laipni lūdzam!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Lai pārvietotu lietotni vai logrīku, pieskarieties tam, turiet to nospiestu un pēc tam mainiet izvietojumu."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Lai redzētu visas savas lietotnes, pieskarieties pogai Visas lietotnes."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Šeit ir visas jūsu lietotnes"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Lai pievienotu lietotni vai logrīku sākuma ekrānam, pieskarieties lietotnei vai logrīkam, turiet to nospiestu un pēc tam izvietojiet to."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Laipni lūdzam!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Lai pārvietotu lietotni vai logrīku, pieskarieties tam, turiet to nospiestu un pēc tam mainiet izvietojumu."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Lai redzētu visas savas lietotnes, pieskarieties pogai Visas lietotnes."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Šeit ir visas jūsu lietotnes"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Lai pievienotu lietotni vai logrīku sākuma ekrānam, pieskarieties lietotnei vai logrīkam, turiet to nospiestu un pēc tam izvietojiet to."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Labi"</string> </resources> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 68697e7d7..b4a892fcb 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -80,15 +80,22 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Membenarkan aplikasi untuk membaca tetapan dan pintasan di Laman Utama."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"menulis tetapan dan pintasan Laman Utama"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Membenarkan aplikasi untuk menukar tetapan dan pintasan di Laman Utama."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Masalah memuatkan widget"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ini adalah aplikasi sistem dan tidak boleh dinyahpasang."</string> <string name="dream_name" msgid="2847171357608437154">"Pelancar Roket"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Folder Tanpa Nama"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Selamat Kembali!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Untuk memindahkan aplikasi atau widget, sentuh & tahan, kemudian atur kedudukannya."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Untuk melihat semua aplikasi anda, sentuh butang Semua Aplikasi."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Berikut adalah semua aplikasi anda"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Untuk menambahkan aplikasi atau widget pada skrin utama anda, sentuh & tahan, kemudian atur kedudukannya."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Selamat Kembali!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Untuk memindahkan aplikasi atau widget, sentuh &amp; tahan, kemudian atur kedudukannya."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Untuk melihat semua aplikasi anda, sentuh butang Semua Aplikasi."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Berikut adalah semua aplikasi anda"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Untuk menambahkan aplikasi atau widget pada skrin utama anda, sentuh & tahan, kemudian atur kedudukannya."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index e059e6dbd..8020afb6e 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram og kan ikke avinstalleres."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Mappe uten navn"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Velkommen til startsiden!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Du kan flytte en app eller modul ved å berøre og holde nede på den, og deretter flytte den."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Du kan se alle appene dine ved å berøre knappen Alle apper."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Her er alle appene dine"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Du kan legge til en app eller modul på startskjermen ved å berøre og holde nede på den, og deretter plassere den."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Velkommen til startsiden!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Du kan flytte en app eller modul ved å berøre og holde nede på den, og deretter flytte den."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Du kan se alle appene dine ved å berøre knappen Alle apper."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Her er alle appene dine"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Du kan legge til en app eller modul på startskjermen ved å berøre og holde nede på den, og deretter plassere den."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 6c2c17ebf..d7f53fc08 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Hiermee kan een app de instellingen en snelkoppelingen op de startpagina lezen."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"instellingen en snelkoppelingen voor de startpagina schrijven"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Hiermee kan een app de instellingen en snelkoppelingen op de startpagina wijzigen."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is een systeemtoepassing die niet kan worden verwijderd."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Naamloze map"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Welkom thuis!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Als u een app of widget wilt verplaatsen, blijft u de app of widget aanraken om deze opnieuw te positioneren."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Als u al uw apps wilt bekijken, raakt u de knop \'Alle apps\' aan."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Hier zijn al uw apps"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Als u een app of widget toevoegt aan uw startscherm, blijft u de app of widget aanraken om deze te positioneren."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Welkom thuis!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Als u een app of widget wilt verplaatsen, blijft u de app of widget aanraken om deze opnieuw te positioneren."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Als u al uw apps wilt bekijken, raakt u de knop \'Alle apps\' aan."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Hier zijn al uw apps"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Als u een app of widget toevoegt aan uw startscherm, blijft u de app of widget aanraken om deze te positioneren."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 607fee12b..f97bb9ada 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"To jest aplikacja systemowa i nie można jej odinstalować."</string> <string name="dream_name" msgid="2847171357608437154">"Wyrzutnia rakiet"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Folder bez nazwy"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Witamy na ekranie głównym"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Aby przenieść aplikację lub widżet, dotknij wybranego elementu i przytrzymaj go, a następnie przesuń w dowolne miejsce."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Aby zobaczyć wszystkie swoje aplikacje, dotknij przycisku Wszystkie aplikacje."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Oto wszystkie Twoje aplikacje"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Aby dodać aplikację lub widżet na ekran główny, dotknij wybranego elementu i przytrzymaj go, a następnie przesuń w dowolne miejsce."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Witamy na ekranie głównym"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Aby przenieść aplikację lub widżet, dotknij wybranego elementu i przytrzymaj go, a następnie przesuń w dowolne miejsce."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Aby zobaczyć wszystkie swoje aplikacje, dotknij przycisku Wszystkie aplikacje."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Oto wszystkie Twoje aplikacje"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Aby dodać aplikację lub widżet na ekran główny, dotknij wybranego elementu i przytrzymaj go, a następnie przesuń w dowolne miejsce."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 5632fcd3e..1c8282d33 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -32,6 +32,8 @@ <dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen> <dimen name="apps_customize_pageLayoutPaddingLeft">5dp</dimen> <dimen name="apps_customize_pageLayoutPaddingRight">5dp</dimen> + <integer name="apps_customize_cling_focused_x">1</integer> + <integer name="apps_customize_cling_focused_y">2</integer> <dimen name="apps_customize_widget_cell_width_gap">20dp</dimen> <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index b30d115af..e7e6c7236 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"É uma aplicação de sistema e não pode ser desinstalada."</string> <string name="dream_name" msgid="2847171357608437154">"Lança-mísseis"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Pasta sem nome"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Bem-vindo!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Para mover uma aplicação ou um widget, toque e mantenha premido o item e, em seguida, reposicione-o."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Para ver todas as suas aplicações, toque no botão Todas as Aplicações."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Estas são todas as suas aplicações"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Para adicionar uma aplicação ou um widget ao ecrã principal, toque e mantenha premido o item e, em seguida, posicione-o."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Bem-vindo!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Para mover uma aplicação ou um widget, toque e mantenha premido o item e, em seguida, reposicione-o."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas as suas aplicações, toque no botão Todas as Aplicações."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Estas são todas as suas aplicações"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Para adicionar uma aplicação ou um widget ao ecrã principal, toque e mantenha premido o item e, em seguida, posicione-o."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 55a06c6bc..fddbfa22d 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Este é um aplicativo do sistema e não pode ser desinstalado."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Pasta sem nome"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Bem-vindo ao Início!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Para mover um aplicativo ou widget, toque nele e o mantenha pressionado. Em seguida, reposicione-o."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Para ver todos os seus aplicativos, toque no botão Todos os aplicativos."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Aqui estão todos os seus aplicativos"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Para adicionar um aplicativo ou widget a sua tela inicial, toque nele e o mantenha pressionado. Em seguida, posicione-o."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Bem-vindo ao Início!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Para mover um aplicativo ou widget, toque nele e o mantenha pressionado. Em seguida, reposicione-o."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todos os seus aplicativos, toque no botão Todos os aplicativos."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Aqui estão todos os seus aplicativos"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Para adicionar um aplicativo ou widget a sua tela inicial, toque nele e o mantenha pressionado. Em seguida, posicione-o."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index af86d52e8..4c3f521b2 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -114,15 +114,21 @@ <skip /> <!-- no translation found for folder_hint_text (8633351560105748141) --> <skip /> - <!-- no translation found for workspace_cling_title (6772061635561632299) --> + <!-- no translation found for workspace_cling_title (738396473989890567) --> <skip /> - <!-- no translation found for workspace_cling_move_item (897064551822359347) --> + <!-- no translation found for workspace_cling_move_item (4270697827183569326) --> <skip /> - <!-- no translation found for workspace_cling_open_all_apps (5287802320356364228) --> + <!-- no translation found for workspace_cling_open_all_apps (2459977609848572588) --> <skip /> - <!-- no translation found for all_apps_cling_title (3057036297077247772) --> + <!-- no translation found for all_apps_cling_title (2559734712581447107) --> <skip /> - <!-- no translation found for all_apps_cling_add_item (4635717397976102935) --> + <!-- no translation found for all_apps_cling_add_item (7404588523183860170) --> + <skip /> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> <skip /> <!-- no translation found for cling_dismiss (2780907108735868381) --> <skip /> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 5450e8192..dd1ffabd7 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite unei aplicaţii să citească setările şi comenzile rapide în Ecranul de pornire."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"scrieţi setări şi comenzi rapide pentru Ecranul de pornire"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite unei aplicaţii să modifice setările şi comenzile rapide pentru Ecranul de pornire."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Probleme la încărcarea obiectului widget"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Aceasta este o aplicaţie a sistemului şi nu se poate dezinstala."</string> <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="6772061635561632299">"Bun venit acasă!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Pentru a muta o aplicaţie sau un widget, atingeţi şi ţineţi apăsat, apoi repoziţionaţi."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Pentru a vedea toate aplicaţiile, atingeţi butonul Toate aplicaţiile."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Aici sunt toate aplicaţiile dvs."</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Pentru a adăuga o aplicaţie sau un widget în ecranul de pornire, atingeţi şi ţineţi apăsat, apoi poziţionaţi."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Bun venit acasă!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Pentru a muta o aplicaţie sau un widget, atingeţi şi ţineţi apăsat, apoi repoziţionaţi."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Pentru a vedea toate aplicaţiile, atingeţi butonul Toate aplicaţiile."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Aici sunt toate aplicaţiile dvs."</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Pentru a adăuga o aplicaţie sau un widget în ecranul de pornire, atingeţi şi ţineţi apăsat, apoi poziţionaţi."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 0abababb6..783829bb4 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -85,10 +85,16 @@ <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="6772061635561632299">"Добро пожаловать на главный экран!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Чтобы переместить значок приложения или виджета, нажмите на него и, удерживая, перетащите."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Чтобы открыть список всех приложений, нажмите кнопку \"Приложения\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Все приложения"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Чтобы добавить приложение или виджет на главный экран, нажмите на значок и, удерживая его, перетащите."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Добро пожаловать на главный экран!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Чтобы переместить значок приложения или виджета, нажмите на него и, удерживая, перетащите."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Чтобы открыть список всех приложений, нажмите кнопку \"Приложения\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Все приложения"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Чтобы добавить приложение или виджет на главный экран, нажмите на значок и, удерживая его, перетащите."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"ОК"</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index e1d4e2dd6..a6eed161a 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikácia a nie je možné ju odinštalovať."</string> <string name="dream_name" msgid="2847171357608437154">"Raketomet"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Nepomenovaný priečinok"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Vitajte na ploche!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Ak chcete presunúť aplikáciu alebo miniaplikáciu, dotknite sa jej, podržte na nej prst a následne zmeňte jej umiestnenie."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Ak chcete zobraziť všetky aplikácie, dotknite sa tlačidla Všetky aplikácie."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Tu sú všetky vaše aplikácie"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Ak chcete na plochu pridať aplikáciu alebo miniaplikáciu, dotknite sa jej, podržte na nej prst a následne ju umiestnite."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Vitajte na ploche!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Ak chcete presunúť aplikáciu alebo miniaplikáciu, dotknite sa jej, podržte na nej prst a následne zmeňte jej umiestnenie."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Ak chcete zobraziť všetky aplikácie, dotknite sa tlačidla Všetky aplikácie."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Tu sú všetky vaše aplikácie"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Ak chcete na plochu pridať aplikáciu alebo miniaplikáciu, dotknite sa jej, podržte na nej prst a následne ju umiestnite."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 1165ee04f..048bacd88 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"To je sistemski program in ga ni mogoče odstraniti."</string> <string name="dream_name" msgid="2847171357608437154">"Raketno izstrelišče"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Neimenovana mapa"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Pozdravljeni na začetnem zaslonu."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Če želite premakniti program ali pripomoček, se ga dotaknite in ga pridržite, nato ga prestavite."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Če želite videti vse programe, se dotaknite gumba »Vsi programi«."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Tu so vsi vaši programi"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Če želite dodati program ali pripomoček na začetni zaslon, se ga dotaknite in ga pridržite, nato ga postavite na želeno mesto."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Pozdravljeni na začetnem zaslonu."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Če želite premakniti program ali pripomoček, se ga dotaknite in ga pridržite, nato ga prestavite."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Če želite videti vse programe, se dotaknite gumba »Vsi programi«."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Tu so vsi vaši programi"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Če želite dodati program ali pripomoček na začetni zaslon, se ga dotaknite in ga pridržite, nato ga postavite na želeno mesto."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"V redu"</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index ee8acbb65..8a2554a9a 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ово је системска апликација и не може да се деинсталира."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Неименовани директоријум"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Добро дошли кући!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Да бисте преместили апликацију или виџет, додирните их и задржите, а затим им промените положај."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Да бисте видели све апликације, додирните дугме Све апликације."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Ово су све апликације"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Да бисте додали апликацију или виџет на почетни екран, додирните их и задржите, а затим их поставите."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Добро дошли кући!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Да бисте преместили апликацију или виџет, додирните их и задржите, а затим им промените положај."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Да бисте видели све апликације, додирните дугме Све апликације."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Ово су све апликације"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Да бисте додали апликацију или виџет на почетни екран, додирните их и задржите, а затим их поставите."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Потврди"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 70bbae637..9fd5bdceb 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Det här är ett systemprogram och kan inte avinstalleras."</string> <string name="dream_name" msgid="2847171357608437154">"Raketavfyringsramp"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Namnlös mapp"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Välkommen till startsidan."</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Om du vill flytta en app eller widget trycker du och håller ned den och placerar sedan om den."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Om du vill se alla dina appar trycker du på knappen Alla appar."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Här finns alla dina appar"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Om du vill lägga till en app eller widget på startsidan trycker du och håller ned den och lägger sedan dit den."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Välkommen till startsidan."</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Om du vill flytta en app eller widget trycker du och håller ned den och placerar sedan om den."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Om du vill se alla dina appar trycker du på knappen Alla appar."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Här finns alla dina appar"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Om du vill lägga till en app eller widget på startsidan trycker du och håller ned den och lägger sedan dit den."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index c836e8d73..d931bfd36 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -41,7 +41,7 @@ <string name="group_widgets" msgid="6704978494073105844">"Wijeti"</string> <string name="group_wallpapers" msgid="1568191644272224858">"Pazia"</string> <string name="out_of_space" msgid="8365249326091984698">"Hakuna nafasi katika skrini hii ya nyumbani."</string> - <string name="invalid_hotseat_item" msgid="6545340627805449250">"Wiji hii ni kubwa zaidi kwa hotseat."</string> + <string name="invalid_hotseat_item" msgid="6545340627805449250">"Wijeti hii ni kubwa zaidi kwa hotseat."</string> <string name="shortcut_installed" msgid="7071557296331322355">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" imeundwa."</string> <string name="shortcut_uninstalled" msgid="2129499669449749995">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" iliondolewa."</string> <string name="shortcut_duplicate" msgid="4757756326465060694">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" tayari ipo."</string> @@ -84,11 +84,18 @@ <string name="gadget_error_text" msgid="8359351016167075858">"Tatizo la kupakia wijeti"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Hii ni programu ya mfumo na haiwezi kuondolewa."</string> <string name="dream_name" msgid="2847171357608437154">"Kizinduzi cha Roketi"</string> - <string name="folder_hint_text" msgid="8633351560105748141">"Kabrasha Lisilo na jina"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Karibu nyumbani!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Kuhamisha programu-matumizi au Orodha ya programu-matumizi, gusa & ishikilie, kisha iweke kwenye nafasi yake."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Kuona programu-matumizi zako zote, gusa kifungo kinachoitwa Programu-Matumizi zote."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Programu-matumizi zako zote ni hizi hapa"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Kuongeza programu-matumizi zako au Orodha ya programu-matumizi yako kwenye skrini yako, gusa & amp; ishikilie, kisha iweke kwenye nafasi yake."</string> + <string name="folder_hint_text" msgid="8633351560105748141">"Folda isiyo na jina"</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Karibu nyumbani!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Kuhamisha programu-matumizi au Orodha ya programu-matumizi, gusa &amp; ishikilie, kisha iweke kwenye nafasi yake."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Kuona programu-matumizi zako zote, gusa kifungo kinachoitwa Programu-Matumizi zote."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Programu-matumizi zako zote ni hizi hapa"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Kuongeza programu-matumizi zako au Orodha ya programu-matumizi yako kwenye skrini yako, gusa & amp; ishikilie, kisha iweke kwenye nafasi yake."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Sawa"</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 64a95b210..be8b92108 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"นี่เป็นแอปพลิเคชันระบบและไม่สามารถถอนการติดตั้งได้"</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"โฟลเดอร์ที่ไม่มีชื่อ"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"ยินดีต้อนรับกลับบ้าน!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"หากต้องการย้ายแอปพลิเคชันหรือวิดเจ็ต เพียงแตะค้างไว้แล้วจัดวางใหม่"</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"หากต้องการดูแอปพลิเคชันทั้งหมดของคุณ ให้แตะปุ่ม \"แอปพลิเคชันทั้งหมด\""</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"นี่คือแอปพลิเคชันทั้งหมดของคุณ"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"หากต้องการเพิ่มแอปพลิเคชันหรือวิดเจ็ตลงในหน้าจอหลัก เพียงแตะค้างไว้แล้วจัดวาง"</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"ยินดีต้อนรับกลับบ้าน!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"หากต้องการย้ายแอปพลิเคชันหรือวิดเจ็ต เพียงแตะค้างไว้แล้วจัดวางใหม่"</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"หากต้องการดูแอปพลิเคชันทั้งหมดของคุณ ให้แตะปุ่ม \"แอปพลิเคชันทั้งหมด\""</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"นี่คือแอปพลิเคชันทั้งหมดของคุณ"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"หากต้องการเพิ่มแอปพลิเคชันหรือวิดเจ็ตลงในหน้าจอหลัก เพียงแตะค้างไว้แล้วจัดวาง"</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"ตกลง"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 4cac10f7f..8cbd58267 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Isa itong system application at hindi maaaring i-install."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Walang Pangalang Folder"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Maligayang Pagdating!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Upang ilipat ang app o widget, pindutin nang matagal, pagkatapos ay ilipat ito."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Upang makita ang lahat ng iyong apps, pindutin ang button na Lahat ng Apps."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Narito ang lahat ng iyong apps"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Upang magdagdag ng app o widget sa iyong home screen, pindutin nang matagal, pagkatapos ay ipuwesto ito."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Maligayang Pagdating!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Upang ilipat ang app o widget, pindutin nang matagal, pagkatapos ay ilipat ito."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Upang makita ang lahat ng iyong apps, pindutin ang button na Lahat ng Apps."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Narito ang lahat ng iyong apps"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Upang magdagdag ng app o widget sa iyong home screen, pindutin nang matagal, pagkatapos ay ipuwesto ito."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index bd4dde31b..efaedbd25 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları okuma izni verir."</string> <string name="permlab_write_settings" msgid="1360567537236705628">"Ana Sayfa ayarlarını ve kısayollarını yaz"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları değiştirme izni verir."</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"Bu bir sistem uygulamasıdır ve kaldırılamaz."</string> <string name="dream_name" msgid="2847171357608437154">"Roket Fırlatıcı"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Adsız Klasör"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Ana Ekrana Hoş Geldiniz!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Bir uygulamayı veya widget\'ı taşımak için ilgili öğeye dokunup basılı tutun ve sonra konumunu değiştirin."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Tüm uygulamalarınızı görmek için Tüm Uygulamalar düğmesine dokunun."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"İşte tüm uygulamalarınız"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Ana ekranınıza bir uygulama veya widget eklemek için, ilgili öğeye dokunup basılı tutun ve sonra konumunu ayarlayın."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Ana Ekrana Hoş Geldiniz!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Bir uygulamayı veya widget\'ı taşımak için ilgili öğeye dokunup basılı tutun ve sonra konumunu değiştirin."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Tüm uygulamalarınızı görmek için Tüm Uygulamalar düğmesine dokunun."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"İşte tüm uygulamalarınız"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Ana ekranınıza bir uygulama veya widget eklemek için, ilgili öğeye dokunup basılı tutun ve sonra konumunu ayarlayın."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"Tamam"</string> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 320731a1b..a20852a7e 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -85,10 +85,16 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Це системна програма, її неможливо видалити."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Папка без назви"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Вітаємо з поверненням!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Щоб перемістити програму чи віджет, натисніть і утримуйте елемент, а потім пересуньте в потрібне місце."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Щоб побачити всі свої програми, торкніться кнопки \"Усі програми\"."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Тут містяться всі ваші програми"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Щоб додати програму чи віджет на головний екран, натисніть і утримуйте елемент, а потім розмістіть у потрібному місці."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Вітаємо з поверненням!"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Щоб перемістити програму чи віджет, натисніть і утримуйте елемент, а потім пересуньте в потрібне місце."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Щоб побачити всі свої програми, торкніться кнопки \"Усі програми\"."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Тут містяться всі ваші програми"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Щоб додати програму чи віджет на головний екран, натисніть і утримуйте елемент, а потім розмістіть у потрібному місці."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"ОК"</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 5c2e5bb8d..e97672c71 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -85,10 +85,17 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Đây là ứng dụng hệ thống và không thể gỡ cài đặt."</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Thư mục chưa đặt tên"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Chào mừng bạn đến với Trang chủ!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Để di chuyển ứng dụng hoặc tiện ích con, chạm & giữ, sau đó định vị lại ứng dụng hoặc tiện ích con đó."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Để xem tất cả ứng dụng của bạn, chạm vào nút Tất cả ứng dụng."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Đây là tất cả ứng dụng của bạn"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Để thêm ứng dụng hoặc tiện ích con vào màn hình chính của bạn, chạm & giữ, sau đó định vị ứng dụng hoặc tiện ích con đó."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Chào mừng bạn đến với Trang chủ!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Để di chuyển ứng dụng hoặc tiện ích con, chạm &amp; giữ, sau đó định vị lại ứng dụng hoặc tiện ích con đó."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Để xem tất cả ứng dụng của bạn, chạm vào nút Tất cả ứng dụng."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Đây là tất cả ứng dụng của bạn"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Để thêm ứng dụng hoặc tiện ích con vào màn hình chính của bạn, chạm & giữ, sau đó định vị ứng dụng hoặc tiện ích con đó."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d601b2360..b3d1c8708 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"允许应用程序读取主屏幕的设置和快捷方式。"</string> <string name="permlab_write_settings" msgid="1360567537236705628">"写入主屏幕的设置和快捷方式"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"允许应用程序更改主屏幕的设置和快捷方式。"</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"载入窗口小部件时出现问题"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"这是系统应用程序，无法卸载。"</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"未命名文件夹"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"欢迎归来！"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"要移动应用程序或窗口小部件，请触摸并按住相应项，然后重新放置。"</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"要查看您全部的应用程序，请触摸“所有应用程序”按钮。"</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"此处显示了您全部的应用程序"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"要将应用程序或窗口小部件添加到主屏幕上，请触摸并按住相应项，然后进行放置。"</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"欢迎归来！"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"要移动应用程序或窗口小部件，请触摸并按住相应项，然后重新放置。"</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"要查看您全部的应用程序，请触摸“所有应用程序”按钮。"</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"此处显示了您全部的应用程序"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"要将应用程序或窗口小部件添加到主屏幕上，请触摸并按住相应项，然后进行放置。"</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"确定"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 3ce6aed3f..5c48dd4be 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -80,15 +80,21 @@ <string name="permdesc_read_settings" msgid="8377434937176025492">"允許應用程式讀取主螢幕中的設定和捷徑。"</string> <string name="permlab_write_settings" msgid="1360567537236705628">"寫入主螢幕設定和捷徑"</string> <string name="permdesc_write_settings" msgid="1098648778383349818">"允許應用程式變更主螢幕中的設定和捷徑。"</string> - <!-- outdated translation 6379401240457905079 --> <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string> + <string name="google_apps_folder_name" msgid="2873137836817266807">"Google"</string> <string name="gadget_error_text" msgid="8359351016167075858">"載入小工具時發生問題"</string> <string name="uninstall_system_app_text" msgid="7488523163288397451">"這是系統應用程式，無法將其解除安裝。"</string> <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="8633351560105748141">"未命名的資料夾"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"歡迎回來！"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"如要移動應用程式或小工具，請輕觸並按住目標項目，然後放置在偏好的位置。"</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"如要查看您所有的應用程式，請輕觸 [所有應用程式] 按鈕。"</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"您的所有應用程式"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"如要將應用程式或小工具新增至主螢幕，請輕觸並按住目標項目，然後放置在偏好的位置。"</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"歡迎回來！"</string> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"如要移動應用程式或小工具，請輕觸並按住目標項目，然後放置在偏好的位置。"</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"如要查看您所有的應用程式，請輕觸 [所有應用程式] 按鈕。"</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"您的所有應用程式"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"如要將應用程式或小工具新增至主螢幕，請輕觸並按住目標項目，然後放置在偏好的位置。"</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"確定"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 6a5febd82..cea03c7e1 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -85,10 +85,17 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string> <string name="dream_name" msgid="2847171357608437154">"Isiqalisi se-Rocket"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Ifolda Engenagama"</string> - <string name="workspace_cling_title" msgid="6772061635561632299">"Wamukelekile Ekhaya!"</string> - <string name="workspace_cling_move_item" msgid="897064551822359347">"Ukuze ususe uhlelo lokusebenza noma izinqunjwana, cindezela & bamba, besa ukubeka endaweni ethile."</string> - <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Ukuze ubone zonke Izinhlelo zakho Ezihlelelwe Ukusebenza, cindezela zonke izinkinobho Zokuhlelwe Ukusebenza."</string> - <string name="all_apps_cling_title" msgid="3057036297077247772">"Nakhu konke okulungiselwe uhlelo lwakho lokusebenza"</string> - <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Yengeza uhlelo lokusebenza noma izinqunjwana kwisikrini sakho sasekhaya, cindezela & bamba, bese usibeka endaweni ethile."</string> + <!-- outdated translation 6772061635561632299 --> <string name="workspace_cling_title" msgid="738396473989890567">"Wamukelekile Ekhaya!"</string> + <!-- unknown quoting pattern: original -1, translation 1 --> + <!-- outdated translation 897064551822359347 --> <string name="workspace_cling_move_item" msgid="4270697827183569326">"Ukuze ususe uhlelo lokusebenza noma izinqunjwana, cindezela &amp; bamba, besa ukubeka endaweni ethile."</string> + <!-- outdated translation 5287802320356364228 --> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Ukuze ubone zonke Izinhlelo zakho Ezihlelelwe Ukusebenza, cindezela zonke izinkinobho Zokuhlelwe Ukusebenza."</string> + <!-- outdated translation 3057036297077247772 --> <string name="all_apps_cling_title" msgid="2559734712581447107">"Nakhu konke okulungiselwe uhlelo lwakho lokusebenza"</string> + <!-- outdated translation 4635717397976102935 --> <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Yengeza uhlelo lokusebenza noma izinqunjwana kwisikrini sakho sasekhaya, cindezela & bamba, bese usibeka endaweni ethile."</string> + <!-- no translation found for folder_cling_title (4308949882377840953) --> + <skip /> + <!-- no translation found for folder_cling_move_item (270598675060435169) --> + <skip /> + <!-- no translation found for folder_cling_create_folder (289412698047625601) --> + <skip /> <string name="cling_dismiss" msgid="2780907108735868381">"KULUNGILE"</string> </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 6c0bc1467..800aeaa5c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -131,6 +131,10 @@ <attr name="widgetCountX" format="integer" /> <!-- Number of widgets vertically --> <attr name="widgetCountY" format="integer" /> + <!-- The x index of the item to be focused in the cling --> + <attr name="clingFocusedX" format="integer" /> + <!-- The y index of the item to be focused in the cling --> + <attr name="clingFocusedY" format="integer" /> </declare-styleable> <!-- HandleView specific attributes. These attributes are used to customize diff --git a/res/values/colors.xml b/res/values/colors.xml index 2389f8e4f..ece0fd895 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -32,7 +32,4 @@ <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color> <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color> - - <color name="cling_button">#BA49C0EC</color> - <color name="cling_button_pressed">#FF49C0EC</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 78c4b2952..2ade5c8e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -234,16 +234,21 @@ s --> <!-- Clings --> <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> - <string name="workspace_cling_title">Welcome Home!</string> - <!-- The description of how to pick up and move an item on the workspace [CHAR_LIMIT=none] --> - <string name="workspace_cling_move_item">To move an app or widget, touch & hold, then reposition it.</string> + <string name="workspace_cling_title">Make yourself at home</string> + <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <string name="workspace_cling_move_item">You can put your favourite apps here.</string> <!-- The description of how to open all apps from the workspace [CHAR_LIMIT=none] --> - <string name="workspace_cling_open_all_apps">To see all your apps, touch the All Apps button.</string> + <string name="workspace_cling_open_all_apps">To see all your apps, touch the circle.</string> <!-- The title text for the All Apps cling [CHAR_LIMIT=none] --> - <string name="all_apps_cling_title">Here are all your apps</string> + <string name="all_apps_cling_title">Choose some apps</string> <!-- The description of how to pick up and add an item to the workspace [CHAR_LIMIT=none] --> - <string name="all_apps_cling_add_item">To add an app or widget to your home screen, touch & hold, then position it.</string> - + <string name="all_apps_cling_add_item">To add an app to your home screen, touch & hold it.</string> + <!-- The title text for the Folder cling [CHAR_LIMIT=none] --> + <string name="folder_cling_title">Organize your apps with folders</string> + <!-- The description of how to move an app [CHAR_LIMIT=none] --> + <string name="folder_cling_move_item">To move an app, touch & hold it.</string> + <!-- The description of how to create a folder [CHAR_LIMIT=none] --> + <string name="folder_cling_create_folder">To make a new folder on your home screen, stack one app on top of another.</string> <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] --> <string name="cling_dismiss">OK</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 9372dbeef..19a05a0a1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,10 +28,10 @@ <style name="ClingButton"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:paddingTop">14dp</item> - <item name="android:paddingBottom">14dp</item> - <item name="android:paddingLeft">58dp</item> - <item name="android:paddingRight">58dp</item> + <item name="android:paddingTop">10dp</item> + <item name="android:paddingBottom">15dp</item> + <item name="android:paddingLeft">35dp</item> + <item name="android:paddingRight">35dp</item> <item name="android:text">@string/cling_dismiss</item> <item name="android:textStyle">bold</item> <item name="android:background">@drawable/cling_button_bg</item> @@ -39,7 +39,8 @@ <style name="ClingTitleText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">28sp</item> + <item name="android:layout_marginBottom">5dp</item> + <item name="android:textSize">23sp</item> <item name="android:textColor">#49C0EC</item> <item name="android:shadowColor">#000000</item> <item name="android:shadowDy">2</item> @@ -145,7 +146,7 @@ <item name="android:paddingRight">25dp</item> <item name="android:textColor">#FFFFFFFF</item> <item name="android:textSize">16sp</item> - <item name="android:shadowColor">#DD000000</item> + <item name="android:shadowColor">#FF000000</item> <item name="android:shadowDx">0.0</item> <item name="android:shadowDy">1.0</item> <item name="android:shadowRadius">4.0</item> diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index b208e884f..6493e973e 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -174,6 +174,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen private ArrayList<ApplicationInfo> mApps; private ArrayList<Object> mWidgets; + // Cling + private int mClingFocusedX; + private int mClingFocusedY; + // Caching private Canvas mCanvas; private Drawable mDefaultWidgetBackground; @@ -234,6 +238,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen a.getDimensionPixelSize(R.styleable.AppsCustomizePagedView_widgetCellHeightGap, 0); mWidgetCountX = a.getInt(R.styleable.AppsCustomizePagedView_widgetCountX, 2); mWidgetCountY = a.getInt(R.styleable.AppsCustomizePagedView_widgetCountY, 2); + mClingFocusedX = a.getInt(R.styleable.AppsCustomizePagedView_clingFocusedX, 0); + mClingFocusedY = a.getInt(R.styleable.AppsCustomizePagedView_clingFocusedY, 0); a.recycle(); mWidgetSpacingLayout = new PagedViewCellLayout(getContext()); @@ -375,6 +381,14 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen mContentWidth = mWidgetSpacingLayout.getContentWidth(); invalidatePageData(Math.max(0, mRestorePage)); mRestorePage = -1; + + int[] offset = new int[2]; + int[] pos = mWidgetSpacingLayout.estimateCellPosition(mClingFocusedX, mClingFocusedY); + mLauncher.getDragLayer().getLocationInDragLayer(this, offset); + pos[0] += (getMeasuredWidth() - mWidgetSpacingLayout.getMeasuredWidth()) / 2 + offset[0]; + pos[1] += (getMeasuredHeight() - mWidgetSpacingLayout.getMeasuredHeight()) / 2 + offset[1]; + mLauncher.showFirstRunAllAppsCling(pos); + } @Override @@ -533,6 +547,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } @Override protected boolean beginDragging(View v) { + // Dismiss the cling + mLauncher.dismissAllAppsCling(null); + if (!super.beginDragging(v)) return false; // Go into spring loaded mode (must happen before we startDrag()) @@ -583,6 +600,19 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } } + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + + // Clean up all the async tasks + Iterator<AppsCustomizeAsyncTask> iter = mRunningTasks.iterator(); + while (iter.hasNext()) { + AppsCustomizeAsyncTask task = (AppsCustomizeAsyncTask) iter.next(); + task.cancel(false); + iter.remove(); + } + } + public void setContentType(ContentType type) { mContentType = type; invalidatePageData(0, (type != ContentType.Applications)); @@ -965,7 +995,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen prepareLoadWidgetPreviewsTask(page, items, cellWidth, cellHeight, mWidgetCountX); } PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(page); - layout.createHardwareLayer(); } private void loadWidgetPreviewsInBackground(AppsCustomizeAsyncTask task, AsyncTaskPageData data) { @@ -1056,6 +1085,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (iy > 0) lp.topMargin = mWidgetHeightGap; layout.addView(widget, lp); } + layout.createHardwareLayer(); invalidate(); forceUpdateAdjacentPagesAlpha(); diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 124cf7332..8b7b95612 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -271,7 +271,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona /* LauncherTransitionable overrides */ @Override - public void onLauncherTransitionStart(Animator animation, boolean toWorkspace) { + public void onLauncherTransitionStart(Launcher l, Animator animation, boolean toWorkspace) { mInTransition = true; // isHardwareAccelerated() checks if we're attached to a window and if that // window is HW accelerated-- we were sometimes not attached to a window @@ -294,14 +294,19 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona } @Override - public void onLauncherTransitionEnd(Animator animation, boolean toWorkspace) { + public void onLauncherTransitionEnd(Launcher l, Animator animation, boolean toWorkspace) { mInTransition = false; if (animation != null) { setLayerType(LAYER_TYPE_NONE, null); } - if (!toWorkspace && !LauncherApplication.isScreenLarge()) { - mAppsCustomizePane.hideScrollingIndicator(false); + if (!toWorkspace) { + // Dismiss the cling if necessary + l.dismissWorkspaceCling(null); + + if (!LauncherApplication.isScreenLarge()) { + mAppsCustomizePane.hideScrollingIndicator(false); + } } } diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java index ae8dd4319..09c5062ae 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -19,9 +19,12 @@ package com.android.launcher2; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; +import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.Point; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; +import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -32,23 +35,32 @@ import com.android.launcher.R; public class Cling extends FrameLayout { + static final String WORKSPACE_CLING_DISMISSED_KEY = "cling.workspace.dismissed"; + static final String ALLAPPS_CLING_DISMISSED_KEY = "cling.allapps.dismissed"; + static final String FOLDER_CLING_DISMISSED_KEY = "cling.folder.dismissed"; + private static String WORKSPACE_PORTRAIT = "workspace_portrait"; private static String WORKSPACE_LANDSCAPE = "workspace_landscape"; private static String ALLAPPS_PORTRAIT = "all_apps_portrait"; private static String ALLAPPS_LANDSCAPE = "all_apps_landscape"; + private static String FOLDER_PORTRAIT = "folder_portrait"; + private static String FOLDER_LANDSCAPE = "folder_landscape"; private Launcher mLauncher; private boolean mIsInitialized; private String mDrawIdentifier; + private Drawable mBackground; private Drawable mPunchThroughGraphic; + private Drawable mHandTouchGraphic; private int mPunchThroughGraphicCenterRadius; private int mAppIconSize; private int mTabBarHeight; private int mTabBarHorizontalPadding; + private int mButtonBarHeight; + private float mRevealRadius; + private int[] mPositionData; - View mWorkspaceDesc1; - View mWorkspaceDesc2; - View mAllAppsDesc; + private Paint mErasePaint; public Cling(Context context) { this(context, null, 0); @@ -66,238 +78,139 @@ public class Cling extends FrameLayout { a.recycle(); } - void init(Launcher l) { + void init(Launcher l, int[] positionData) { if (!mIsInitialized) { mLauncher = l; + mPositionData = positionData; Resources r = getContext().getResources(); mPunchThroughGraphic = r.getDrawable(R.drawable.cling); mPunchThroughGraphicCenterRadius = r.getDimensionPixelSize(R.dimen.clingPunchThroughGraphicCenterRadius); mAppIconSize = r.getDimensionPixelSize(R.dimen.app_icon_size); + mRevealRadius = mAppIconSize * 1f; mTabBarHeight = r.getDimensionPixelSize(R.dimen.apps_customize_tab_bar_height); mTabBarHorizontalPadding = r.getDimensionPixelSize(R.dimen.toolbar_button_horizontal_padding); + mButtonBarHeight = r.getDimensionPixelSize(R.dimen.button_bar_height); + + mErasePaint = new Paint(); + mErasePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); + mErasePaint.setColor(0xFFFFFF); + mErasePaint.setAlpha(0); - mWorkspaceDesc1 = findViewById(R.id.workspace_cling_move_item); - mWorkspaceDesc2 = findViewById(R.id.workspace_cling_open_all_apps); - mAllAppsDesc = findViewById(R.id.all_apps_cling_add_item); mIsInitialized = true; } } void cleanup() { + mBackground = null; mPunchThroughGraphic = null; + mHandTouchGraphic = null; + mIsInitialized = false; + } + + private int[] getPunchThroughPosition() { + if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT)) { + return new int[]{getMeasuredWidth() / 2, getMeasuredHeight() - (mButtonBarHeight / 2)}; + } else if (mDrawIdentifier.equals(WORKSPACE_LANDSCAPE)) { + return new int[]{getMeasuredWidth() - (mButtonBarHeight / 2), getMeasuredHeight() / 2}; + } else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT) || + mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) { + return mPositionData; + } + return new int[]{-1, -1}; } @Override public boolean onTouchEvent(android.view.MotionEvent event) { - // Do nothing + if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) || + mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) || + mDrawIdentifier.equals(ALLAPPS_PORTRAIT) || + mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) { + int[] pos = getPunchThroughPosition(); + double diff = Math.sqrt(Math.pow(event.getX() - pos[0], 2) + + Math.pow(event.getY() - pos[1], 2)); + if (diff < mRevealRadius) { + return false; + } + } else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) || + mDrawIdentifier.equals(FOLDER_LANDSCAPE)) { + Folder f = mLauncher.getWorkspace().getOpenFolder(); + if (f != null) { + Rect r = new Rect(); + f.getHitRect(r); + if (r.contains((int) event.getX(), (int) event.getY())) { + return false; + } + } + } return true; }; @Override protected void dispatchDraw(Canvas canvas) { - // Draw the rest of the cling - super.dispatchDraw(canvas); - if (mIsInitialized) { DisplayMetrics metrics = new DisplayMetrics(); mLauncher.getWindowManager().getDefaultDisplay().getMetrics(metrics); - int dotRadius = (int) (6f * metrics.density); - - Paint p = new Paint(); - p.setAntiAlias(true); - p.setColor(0xFF49C0EC); - if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT)) { - /* Draw the all apps line */ { - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) - mWorkspaceDesc2.getLayoutParams(); - int[] loc = new int[2]; - mWorkspaceDesc2.getLocationInWindow(loc); - int x = loc[0]; - int xOffset = (int) (10f * metrics.density); - int y = loc[1]; - int yOffset = (int) (30f * metrics.density); - int w = mWorkspaceDesc2.getWidth(); - int h = mWorkspaceDesc2.getHeight(); - - Point p1 = new Point(x + w + xOffset, y - (2 * dotRadius)); - Point p2 = new Point(getMeasuredWidth() / 2, getMeasuredHeight() - - mAppIconSize / 2 - yOffset); - canvas.drawCircle(p1.x, p1.y, dotRadius, p); - canvas.drawCircle(p2.x, p2.y, dotRadius, p); - - Point p3 = new Point(p1.x, (int) (p1.y + (p2.y - p1.y) * 0.30f)); - Point p4 = new Point(p2.x, (int) (p1.y + (p2.y - p1.y) * 0.55f)); - canvas.drawLine(p1.x, p1.y, p3.x, p3.y, p); - canvas.drawLine(p3.x, p3.y, p4.x, p4.y, p); - canvas.drawLine(p4.x, p4.y, p2.x, p2.y, p); - } - - /* Draw the move line */ { - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) - mWorkspaceDesc1.getLayoutParams(); - int[] loc = new int[2]; - mWorkspaceDesc1.getLocationInWindow(loc); - int x = loc[0]; - int y = loc[1]; - int w = mWorkspaceDesc1.getWidth(); - int h = mWorkspaceDesc1.getHeight(); - - Point p1 = new Point(x + w, y - (2 * dotRadius)); - Point p2 = new Point(x + w, getMeasuredHeight() - (4 * mAppIconSize)); - canvas.drawCircle(p1.x, p1.y, dotRadius, p); - canvas.drawCircle(p2.x, p2.y, dotRadius, p); - canvas.drawLine(p1.x, p1.y, p2.x, p2.y, p); - } - } else if (mDrawIdentifier.equals(WORKSPACE_LANDSCAPE)) { - int xOffset = (int) (1.5f * mAppIconSize); - /* Draw the all apps line */ { - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) - mWorkspaceDesc2.getLayoutParams(); - int[] loc = new int[2]; - mWorkspaceDesc2.getLocationInWindow(loc); - int x = loc[0]; - int y = loc[1]; - int w = mWorkspaceDesc2.getWidth(); - int h = mWorkspaceDesc2.getHeight(); - - Point p1 = new Point(x + w, y - (2 * dotRadius)); - Point p2 = new Point(getMeasuredWidth() - xOffset, - getMeasuredHeight() / 2); - canvas.drawCircle(p1.x, p1.y, dotRadius, p); - canvas.drawCircle(p2.x, p2.y, dotRadius, p); - - Point p3 = new Point((int) (p1.x + (p2.x - p1.x) * 0.6f), p1.y); - Point p4 = new Point((int) (p1.x + (p2.x - p1.x) * 0.75f), p2.y); - canvas.drawLine(p1.x, p1.y, p3.x, p3.y, p); - canvas.drawLine(p3.x, p3.y, p4.x, p4.y, p); - canvas.drawLine(p4.x, p4.y, p2.x, p2.y, p); - } - - /* Draw the move line */ { - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) - mWorkspaceDesc1.getLayoutParams(); - int[] loc = new int[2]; - mWorkspaceDesc1.getLocationInWindow(loc); - int x = loc[0]; - int y = loc[1]; - int w = mWorkspaceDesc1.getWidth(); - int h = mWorkspaceDesc1.getHeight(); - - Point p1 = new Point(x + w, y - (2 * dotRadius)); - Point p2 = new Point(getMeasuredWidth() - xOffset, y - (2 * dotRadius)); - canvas.drawCircle(p1.x, p1.y, dotRadius, p); - canvas.drawCircle(p2.x, p2.y, dotRadius, p); - canvas.drawLine(p1.x, p1.y, p2.x, p2.y, p); - } - } else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT)) { - float r = mAppIconSize * 1.1f; - float scale = r / mPunchThroughGraphicCenterRadius; - int dw = (int) (scale * mPunchThroughGraphic.getIntrinsicWidth()); - int dh = (int) (scale * mPunchThroughGraphic.getIntrinsicHeight()); - int cx = getMeasuredWidth() / 2; - int cy = mTabBarHeight + ((getMeasuredHeight() - mTabBarHeight) / 2); - mPunchThroughGraphic.setBounds(cx - dw/2, cy - dh/2, cx + dw/2, cy + dh/2); - mPunchThroughGraphic.draw(canvas); - - /* Draw the line */ { - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) - mAllAppsDesc.getLayoutParams(); - int[] loc = new int[2]; - mAllAppsDesc.getLocationInWindow(loc); - int x = loc[0]; - int y = loc[1]; - int yOffset = (int) (2.5f * metrics.density); - int w = mAllAppsDesc.getWidth(); - int h = mAllAppsDesc.getHeight(); - - Point p1 = new Point(getMeasuredWidth() / 2, y + h + yOffset); - Point p2 = new Point(cx, cy); - canvas.drawCircle(p1.x, p1.y, dotRadius, p); - canvas.drawCircle(p2.x, p2.y, dotRadius, p); - canvas.drawLine(p1.x, p1.y, p2.x, p2.y, p); - } - } else if (mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) { - float r = mAppIconSize * 1.1f; - float scale = r / mPunchThroughGraphicCenterRadius; - int dw = (int) (scale * mPunchThroughGraphic.getIntrinsicWidth()); - int dh = (int) (scale * mPunchThroughGraphic.getIntrinsicHeight()); - int cx = getMeasuredWidth() / 2 + getMeasuredWidth() / 4; - int cy = mTabBarHeight + ((getMeasuredHeight() - mTabBarHeight) / 2); - mPunchThroughGraphic.setBounds(cx - dw/2, cy - dh/2, cx + dw/2, cy + dh/2); - mPunchThroughGraphic.draw(canvas); - - /* Draw the line */ { - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) - mAllAppsDesc.getLayoutParams(); - int[] loc = new int[2]; - mAllAppsDesc.getLocationInWindow(loc); - int x = loc[0]; - int y = loc[1]; - int w = mAllAppsDesc.getWidth(); - int h = mAllAppsDesc.getHeight(); - - Point p1 = new Point(x + w, y); - Point p2 = new Point(cx, cy); - canvas.drawCircle(p1.x, p1.y, dotRadius, p); - canvas.drawCircle(p2.x, p2.y, dotRadius, p); - canvas.drawLine(p1.x, p1.y, p2.x, p2.y, p); - } - } - - /* - // Draw the background + // Initialize the draw buffer (to allow punching through) Bitmap b = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(), Bitmap.Config.ARGB_8888); Canvas c = new Canvas(b); - c.drawColor(0xD4000000); - Paint p = new Paint(); - p.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); - p.setColor(0xFFFFFF); - p.setAlpha(0); + + // Draw the background + if (mBackground == null) { + if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT)) { + mBackground = getResources().getDrawable(R.drawable.bg_cling1); + } else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT)) { + mBackground = getResources().getDrawable(R.drawable.bg_cling2); + } else if (mDrawIdentifier.equals(FOLDER_PORTRAIT)) { + mBackground = getResources().getDrawable(R.drawable.bg_cling3); + } + } + if (mBackground != null) { + mBackground.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight()); + mBackground.draw(c); + } else { + c.drawColor(0x99000000); + } int cx = -1; int cy = -1; - float r = mAppIconSize * 1.4f; - float scale = r / mPunchThroughGraphicCenterRadius; + float scale = mRevealRadius / mPunchThroughGraphicCenterRadius; int dw = (int) (scale * mPunchThroughGraphic.getIntrinsicWidth()); int dh = (int) (scale * mPunchThroughGraphic.getIntrinsicHeight()); - if (mDrawIdentifier.equals("workspace_portrait")) { - cx = getMeasuredWidth() / 2; - cy = getMeasuredHeight() - mAppIconSize / 2; - } else if (mDrawIdentifier.equals("workspace_landscape")) { - cx = getMeasuredWidth() - mAppIconSize / 2; - cy = getMeasuredHeight() / 2; - } else if (mDrawIdentifier.equals("large_workspace_landscape") || - mDrawIdentifier.equals("large_workspace_portrait")) { - cx = getMeasuredWidth() - mTabBarHorizontalPadding; - cy = 0; - } else if (mDrawIdentifier.equals("all_apps_portrait")) { - cx = getMeasuredWidth() / 2; - cy = mTabBarHeight + ((getMeasuredHeight() - mTabBarHeight) / 2); - } else if (mDrawIdentifier.equals("all_apps_landscape")) { - cx = getMeasuredWidth() / 2 + getMeasuredWidth() / 4; - cy = mTabBarHeight + ((getMeasuredHeight() - mTabBarHeight) / 2); - } else if (mDrawIdentifier.equals("large_all_apps_portrait")) { - cx = getMeasuredWidth() / 2; - cy = mTabBarHeight + (int) ((getMeasuredHeight() - mTabBarHeight) * 2f / 5f); - } else if (mDrawIdentifier.equals("large_all_apps_landscape")) { - cx = getMeasuredWidth() / 2 + getMeasuredWidth() / 6; - cy = mTabBarHeight + (int) ((getMeasuredHeight() - mTabBarHeight) * 2f / 5f); - } + // Determine where to draw the punch through graphic + int[] pos = getPunchThroughPosition(); + cx = pos[0]; + cy = pos[1]; if (cx > -1 && cy > -1) { - c.drawCircle(cx, cy, r, p); + c.drawCircle(cx, cy, mRevealRadius, mErasePaint); mPunchThroughGraphic.setBounds(cx - dw/2, cy - dh/2, cx + dw/2, cy + dh/2); mPunchThroughGraphic.draw(c); } + + // Draw the hand graphic in All Apps + if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT) || + mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) { + if (mHandTouchGraphic == null) { + mHandTouchGraphic = getResources().getDrawable(R.drawable.hand); + } + int offset = -mAppIconSize / 4; + mHandTouchGraphic.setBounds(cx + offset, cy + offset, + cx + mHandTouchGraphic.getIntrinsicWidth() + offset, + cy + mHandTouchGraphic.getIntrinsicHeight() + offset); + mHandTouchGraphic.draw(c); + } + canvas.drawBitmap(b, 0, 0, null); c.setBitmap(null); b = null; - */ } + + // Draw the rest of the cling + super.dispatchDraw(canvas); }; } diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index d0d4bad6e..28ef6a59f 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -108,7 +108,7 @@ public class DragLayer extends FrameLayout { } Folder currentFolder = mLauncher.getWorkspace().getOpenFolder(); - if (currentFolder != null && intercept) { + if (currentFolder != null && !mLauncher.isFolderClingVisible() && intercept) { if (currentFolder.isEditingName()) { getDescendantRectRelativeToSelf(currentFolder.getEditTextRegion(), hitRect); if (!hitRect.contains(x, y)) { diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index a0342cf06..a1aa670c5 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -208,6 +208,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList return false; } + mLauncher.dismissFolderCling(null); + mLauncher.getWorkspace().onDragStartedWithItem(v); mLauncher.getWorkspace().beginDragShared(v, this); mIconDrawable = ((TextView) v).getCompoundDrawables()[1]; diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 29f3f252b..3c2c3daea 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -75,9 +75,10 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.Surface; import android.view.View; +import android.view.View.OnLongClickListener; import android.view.ViewGroup; +import android.view.ViewParent; import android.view.WindowManager; -import android.view.View.OnLongClickListener; import android.view.accessibility.AccessibilityEvent; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.DecelerateInterpolator; @@ -161,7 +162,8 @@ public final class Launcher extends Activity static final int APPWIDGET_HOST_ID = 1024; private static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT = 300; private static final int EXIT_SPRINGLOADED_MODE_LONG_TIMEOUT = 600; - private static final int DISMISS_CLING_DURATION = 300; + private static final int SHOW_CLING_DURATION = 250; + private static final int DISMISS_CLING_DURATION = 250; private static final Object sLock = new Object(); private static int sScreen = DEFAULT_SCREEN; @@ -271,7 +273,7 @@ public final class Launcher extends Activity checkForLocaleChange(); setContentView(R.layout.launcher); setupViews(); - enableClingsIfNecessary(); + showFirstRunWorkspaceCling(); registerContentObservers(); @@ -872,9 +874,7 @@ public final class Launcher extends Activity return p; } - // TODO: This should be ICE_CREAM_SANDWICH, but since the unbundled apps - // may not have updated their targetSdkVersion yet, we've bumped it down for now. - if (appInfo.targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB_MR2) { + if (appInfo.targetSdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { Resources r = getResources(); p.left = r.getDimensionPixelSize(R.dimen.app_widget_padding_left); p.right = r.getDimensionPixelSize(R.dimen.app_widget_padding_right); @@ -1770,6 +1770,8 @@ public final class Launcher extends Activity final FolderInfo info = folderIcon.mInfo; Folder openFolder = mWorkspace.getFolderForTag(info); + Cling cling = showFirstRunFoldersCling(); + // If the folder info reports that the associated folder is open, then verify that // it is actually opened. There have been a few instances where this gets out of sync. if (info.opened && openFolder == null) { @@ -1798,6 +1800,10 @@ public final class Launcher extends Activity } } } + + if (cling != null) { + cling.bringToFront(); + } } private void growAndFadeOutFolderIcon(FolderIcon fi) { @@ -1874,6 +1880,9 @@ public final class Launcher extends Activity Folder folder = mWorkspace.getOpenFolder(); if (folder != null) { closeFolder(folder); + + // Dismiss the folder cling + dismissFolderCling(null); } } @@ -2119,6 +2128,7 @@ public final class Launcher extends Activity */ private void cameraZoomOut(State toState, boolean animated, final boolean springLoaded) { final Resources res = getResources(); + final Launcher instance = this; final int duration = res.getInteger(R.integer.config_appsCustomizeZoomInTime); final int fadeDuration = res.getInteger(R.integer.config_appsCustomizeFadeInTime); @@ -2159,7 +2169,8 @@ public final class Launcher extends Activity alphaAnim.start(); if (toView instanceof LauncherTransitionable) { - ((LauncherTransitionable) toView).onLauncherTransitionStart(scaleAnim, false); + ((LauncherTransitionable) toView).onLauncherTransitionStart(instance, scaleAnim, + false); } scaleAnim.addListener(new AnimatorListenerAdapter() { boolean animationCancelled = false; @@ -2181,7 +2192,8 @@ public final class Launcher extends Activity toView.setScaleX(1.0f); toView.setScaleY(1.0f); if (toView instanceof LauncherTransitionable) { - ((LauncherTransitionable) toView).onLauncherTransitionEnd(scaleAnim, false); + ((LauncherTransitionable) toView).onLauncherTransitionEnd(instance, + scaleAnim, false); } if (!springLoaded && !LauncherApplication.isScreenLarge()) { @@ -2214,8 +2226,8 @@ public final class Launcher extends Activity toView.setVisibility(View.VISIBLE); toView.bringToFront(); if (toView instanceof LauncherTransitionable) { - ((LauncherTransitionable) toView).onLauncherTransitionStart(null, false); - ((LauncherTransitionable) toView).onLauncherTransitionEnd(null, false); + ((LauncherTransitionable) toView).onLauncherTransitionStart(instance, null, false); + ((LauncherTransitionable) toView).onLauncherTransitionEnd(instance, null, false); if (!springLoaded && !LauncherApplication.isScreenLarge()) { // Hide the workspace scrollbar @@ -2235,6 +2247,7 @@ public final class Launcher extends Activity */ private void cameraZoomIn(State fromState, boolean animated, final boolean springLoaded) { Resources res = getResources(); + final Launcher instance = this; final int duration = res.getInteger(R.integer.config_appsCustomizeZoomOutTime); final float scaleFactor = (float) @@ -2270,7 +2283,8 @@ public final class Launcher extends Activity } }); if (fromView instanceof LauncherTransitionable) { - ((LauncherTransitionable) fromView).onLauncherTransitionStart(alphaAnim, true); + ((LauncherTransitionable) fromView).onLauncherTransitionStart(instance, alphaAnim, + true); } alphaAnim.addListener(new AnimatorListenerAdapter() { @Override @@ -2278,7 +2292,8 @@ public final class Launcher extends Activity updateWallpaperVisibility(true); fromView.setVisibility(View.GONE); if (fromView instanceof LauncherTransitionable) { - ((LauncherTransitionable) fromView).onLauncherTransitionEnd(alphaAnim,true); + ((LauncherTransitionable) fromView).onLauncherTransitionEnd(instance, + alphaAnim, true); } mWorkspace.hideScrollingIndicator(false); } @@ -2289,8 +2304,8 @@ public final class Launcher extends Activity } else { fromView.setVisibility(View.GONE); if (fromView instanceof LauncherTransitionable) { - ((LauncherTransitionable) fromView).onLauncherTransitionStart(null, true); - ((LauncherTransitionable) fromView).onLauncherTransitionEnd(null, true); + ((LauncherTransitionable) fromView).onLauncherTransitionStart(instance, null, true); + ((LauncherTransitionable) fromView).onLauncherTransitionEnd(instance, null, true); } } } @@ -3067,33 +3082,40 @@ public final class Launcher extends Activity } /* Cling related */ - private static final String WORKSPACE_CLING_DISMISSED_KEY = "cling.workspace.dismissed"; - private static final String ALLAPPS_CLING_DISMISSED_KEY = "cling.allapps.dismissed"; - private void enableClingsIfNecessary() { + private static final String PREFS_KEY = "com.android.launcher2.prefs"; + private boolean isClingsEnabled() { // TEMPORARY: DISABLE CLINGS ON LARGE UI - if (LauncherApplication.isScreenLarge()) return; - + if (LauncherApplication.isScreenLarge()) return false; // disable clings when running in a test harness - if(ActivityManager.isRunningInTestHarness()) return; + if(ActivityManager.isRunningInTestHarness()) return false; - // Enable the clings only if they have not been dismissed before - SharedPreferences prefs = - getSharedPreferences("com.android.launcher2.prefs", Context.MODE_PRIVATE); - if (!prefs.getBoolean(WORKSPACE_CLING_DISMISSED_KEY, false)) { - Cling cling = (Cling) findViewById(R.id.workspace_cling); - cling.init(this); - cling.setVisibility(View.VISIBLE); - } - if (!prefs.getBoolean(ALLAPPS_CLING_DISMISSED_KEY, false)) { - Cling cling = (Cling) findViewById(R.id.all_apps_cling); - cling.init(this); + return true; + } + private Cling initCling(int clingId, int[] positionData, boolean animate, int delay) { + Cling cling = (Cling) findViewById(clingId); + if (cling != null) { + cling.init(this, positionData); cling.setVisibility(View.VISIBLE); + cling.setLayerType(View.LAYER_TYPE_HARDWARE, null); + if (animate) { + cling.buildLayer(); + cling.setAlpha(0f); + cling.animate() + .alpha(1f) + .setInterpolator(new DecelerateInterpolator()) + .setDuration(SHOW_CLING_DURATION) + .setStartDelay(delay) + .start(); + } else { + cling.setAlpha(1f); + } } + return cling; } - private void dismissCling(final Cling cling, final String flag) { + private void dismissCling(final Cling cling, final String flag, int duration) { if (cling != null) { ObjectAnimator anim = ObjectAnimator.ofFloat(cling, "alpha", 0f); - anim.setDuration(DISMISS_CLING_DURATION); + anim.setDuration(duration); anim.addListener(new AnimatorListenerAdapter() { public void onAnimationEnd(Animator animation) { cling.setVisibility(View.GONE); @@ -3108,13 +3130,68 @@ public final class Launcher extends Activity anim.start(); } } + private void removeCling(int id) { + final View cling = findViewById(id); + if (cling != null) { + final ViewGroup parent = (ViewGroup) cling.getParent(); + parent.post(new Runnable() { + @Override + public void run() { + parent.removeView(cling); + } + }); + } + } + public void showFirstRunWorkspaceCling() { + // Enable the clings only if they have not been dismissed before + SharedPreferences prefs = + getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE); + if (isClingsEnabled() && !prefs.getBoolean(Cling.WORKSPACE_CLING_DISMISSED_KEY, false)) { + initCling(R.id.workspace_cling, null, false, 0); + } else { + removeCling(R.id.workspace_cling); + } + } + public void showFirstRunAllAppsCling(int[] position) { + // Enable the clings only if they have not been dismissed before + SharedPreferences prefs = + getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE); + if (isClingsEnabled() && !prefs.getBoolean(Cling.ALLAPPS_CLING_DISMISSED_KEY, false)) { + initCling(R.id.all_apps_cling, position, true, 0); + } else { + removeCling(R.id.all_apps_cling); + } + } + public Cling showFirstRunFoldersCling() { + // Enable the clings only if they have not been dismissed before + SharedPreferences prefs = + getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE); + Cling cling = null; + if (isClingsEnabled() && !prefs.getBoolean(Cling.FOLDER_CLING_DISMISSED_KEY, false)) { + cling = initCling(R.id.folder_cling, null, true, 0); + } else { + removeCling(R.id.folder_cling); + } + return cling; + } + public boolean isFolderClingVisible() { + Cling cling = (Cling) findViewById(R.id.folder_cling); + if (cling != null) { + return cling.getVisibility() == View.VISIBLE; + } + return false; + } public void dismissWorkspaceCling(View v) { Cling cling = (Cling) findViewById(R.id.workspace_cling); - dismissCling(cling, WORKSPACE_CLING_DISMISSED_KEY); + dismissCling(cling, Cling.WORKSPACE_CLING_DISMISSED_KEY, DISMISS_CLING_DURATION); } public void dismissAllAppsCling(View v) { Cling cling = (Cling) findViewById(R.id.all_apps_cling); - dismissCling(cling, ALLAPPS_CLING_DISMISSED_KEY); + dismissCling(cling, Cling.ALLAPPS_CLING_DISMISSED_KEY, DISMISS_CLING_DURATION); + } + public void dismissFolderCling(View v) { + Cling cling = (Cling) findViewById(R.id.folder_cling); + dismissCling(cling, Cling.FOLDER_CLING_DISMISSED_KEY, DISMISS_CLING_DURATION); } /** @@ -3138,6 +3215,6 @@ public final class Launcher extends Activity } interface LauncherTransitionable { - void onLauncherTransitionStart(Animator animation, boolean toWorkspace); - void onLauncherTransitionEnd(Animator animation, boolean toWorkspace); + void onLauncherTransitionStart(Launcher l, Animator animation, boolean toWorkspace); + void onLauncherTransitionEnd(Launcher l, Animator animation, boolean toWorkspace); } diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 9a105d104..d7e9e06e0 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -204,9 +204,9 @@ public abstract class PagedView extends ViewGroup { mPageLayoutPaddingRight = a.getDimensionPixelSize( R.styleable.PagedView_pageLayoutPaddingRight, 0); mPageLayoutWidthGap = a.getDimensionPixelSize( - R.styleable.PagedView_pageLayoutWidthGap, -1); + R.styleable.PagedView_pageLayoutWidthGap, 0); mPageLayoutHeightGap = a.getDimensionPixelSize( - R.styleable.PagedView_pageLayoutHeightGap, -1); + R.styleable.PagedView_pageLayoutHeightGap, 0); mScrollIndicatorPaddingLeft = a.getDimensionPixelSize(R.styleable.PagedView_scrollIndicatorPaddingLeft, 0); mScrollIndicatorPaddingRight = diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index 29dc3521b..5e87b46d2 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -352,6 +352,14 @@ public class PagedViewCellLayout extends ViewGroup implements Page { return n; } + /** Returns an estimated center position of the cell at the specified index */ + public int[] estimateCellPosition(int x, int y) { + return new int[] { + mPaddingLeft + (x * mCellWidth) + (x * mWidthGap) + (mCellWidth / 2), + mPaddingTop + (y * mCellHeight) + (y * mHeightGap) + (mCellHeight / 2) + }; + } + public void calculateCellCount(int width, int height, int maxCellCountX, int maxCellCountY) { mCellCountX = Math.min(maxCellCountX, estimateCellHSpan(width)); mCellCountY = Math.min(maxCellCountY, estimateCellVSpan(height)); |
