diff options
author | Winson Chung <winsonc@google.com> | 2013-10-10 16:28:52 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-10-10 17:18:53 -0700 |
commit | f7e11e908090bd4f8ed1da4d6feb21e57e8bd9e0 (patch) | |
tree | 11ad08ab3bdf0ed2bb139111b4d3959a109f2766 /res | |
parent | d1e474a92e47171a985738144887e1f2e46c7768 (diff) | |
download | android_packages_apps_Trebuchet-f7e11e908090bd4f8ed1da4d6feb21e57e8bd9e0.tar.gz android_packages_apps_Trebuchet-f7e11e908090bd4f8ed1da4d6feb21e57e8bd9e0.tar.bz2 android_packages_apps_Trebuchet-f7e11e908090bd4f8ed1da4d6feb21e57e8bd9e0.zip |
Fixing RTL issues with Clings. (Bug 11008488)
Change-Id: I78f891eabab53d6ded18f7c843504219d71e2883
Diffstat (limited to 'res')
17 files changed, 68 insertions, 25 deletions
diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png Binary files differindex 42a889fb1..36fbfc8b6 100644 --- a/res/drawable-hdpi/cling.9.png +++ b/res/drawable-hdpi/cling.9.png diff --git a/res/drawable-hdpi/cling_button.9.png b/res/drawable-hdpi/cling_button.9.png Binary files differindex 4dbe56433..e30838241 100644 --- a/res/drawable-hdpi/cling_button.9.png +++ b/res/drawable-hdpi/cling_button.9.png diff --git a/res/drawable-hdpi/cling_button_pressed.9.png b/res/drawable-hdpi/cling_button_pressed.9.png Binary files differindex 2a85cabfa..4f9ca6f7a 100644 --- a/res/drawable-hdpi/cling_button_pressed.9.png +++ b/res/drawable-hdpi/cling_button_pressed.9.png diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png Binary files differindex f6f730d86..4c0f139ee 100644 --- a/res/drawable-mdpi/cling.9.png +++ b/res/drawable-mdpi/cling.9.png diff --git a/res/drawable-mdpi/cling_button.9.png b/res/drawable-mdpi/cling_button.9.png Binary files differindex 38de60aee..a0b6f9735 100644 --- a/res/drawable-mdpi/cling_button.9.png +++ b/res/drawable-mdpi/cling_button.9.png diff --git a/res/drawable-mdpi/cling_button_pressed.9.png b/res/drawable-mdpi/cling_button_pressed.9.png Binary files differindex c60837d2a..986e66944 100644 --- a/res/drawable-mdpi/cling_button_pressed.9.png +++ b/res/drawable-mdpi/cling_button_pressed.9.png diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png Binary files differindex 9cc03c92c..1cb468159 100644 --- a/res/drawable-xhdpi/cling.9.png +++ b/res/drawable-xhdpi/cling.9.png diff --git a/res/drawable-xhdpi/cling_button.9.png b/res/drawable-xhdpi/cling_button.9.png Binary files differindex 1c93bc41f..4192563b5 100644 --- a/res/drawable-xhdpi/cling_button.9.png +++ b/res/drawable-xhdpi/cling_button.9.png diff --git a/res/drawable-xhdpi/cling_button_pressed.9.png b/res/drawable-xhdpi/cling_button_pressed.9.png Binary files differindex b5d4aaea5..d3ce46977 100644 --- a/res/drawable-xhdpi/cling_button_pressed.9.png +++ b/res/drawable-xhdpi/cling_button_pressed.9.png diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png Binary files differindex 3dcf12130..7beae03bf 100644 --- a/res/drawable-xxhdpi/cling.9.png +++ b/res/drawable-xxhdpi/cling.9.png diff --git a/res/drawable-xxhdpi/cling_button.9.png b/res/drawable-xxhdpi/cling_button.9.png Binary files differindex 4f68a03ff..e41287613 100644 --- a/res/drawable-xxhdpi/cling_button.9.png +++ b/res/drawable-xxhdpi/cling_button.9.png diff --git a/res/drawable-xxhdpi/cling_button_pressed.9.png b/res/drawable-xxhdpi/cling_button_pressed.9.png Binary files differindex 4bc033764..55e89da08 100644 --- a/res/drawable-xxhdpi/cling_button_pressed.9.png +++ b/res/drawable-xxhdpi/cling_button_pressed.9.png diff --git a/res/drawable/cling_arrow_end.xml b/res/drawable/cling_arrow_end.xml new file mode 100644 index 000000000..3f63c7d24 --- /dev/null +++ b/res/drawable/cling_arrow_end.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/cling_arrow_right" + android:autoMirrored="true"> +</bitmap> diff --git a/res/drawable/cling_arrow_start.xml b/res/drawable/cling_arrow_start.xml new file mode 100644 index 000000000..ebe91830d --- /dev/null +++ b/res/drawable/cling_arrow_start.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/cling_arrow_left" + android:autoMirrored="true"> +</bitmap> diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml index 9baee64b7..4830e5df8 100644 --- a/res/layout-port/first_run_cling.xml +++ b/res/layout-port/first_run_cling.xml @@ -54,11 +54,13 @@ <TextView style="@style/ClingHintText" android:id="@+id/search_bar_hint" - android:layout_width="160dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|end" android:layout_marginEnd="10dp" android:layout_marginTop="65dp" + android:gravity="center_horizontal" + android:maxWidth="160dp" android:visibility="gone" android:drawableTop="@drawable/cling_arrow_up" android:drawablePadding="5dp" @@ -66,23 +68,26 @@ <TextView style="@style/ClingHintText" android:id="@+id/custom_content_hint" - android:layout_width="160dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="top" + android:layout_gravity="top|start" android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" android:layout_marginTop="100dp" + android:maxWidth="160dp" android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_left" + android:drawableStart="@drawable/cling_arrow_start" android:drawablePadding="10dp" android:text="@string/first_run_cling_custom_content_hint" /> <TextView style="@style/ClingHintText" - android:layout_width="160dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_marginEnd="10dp" android:layout_marginBottom="85dp" - android:drawableEnd="@drawable/cling_arrow_right" + android:maxWidth="180dp" + android:drawableEnd="@drawable/cling_arrow_end" android:drawablePadding="5dp" android:text="@string/first_run_cling_create_screens_hint" /> </FrameLayout> diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index e61340eae..9c000cb54 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -62,9 +62,9 @@ android:id="@+id/focused_hotseat_app_bubble" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="25dp" - android:layout_marginBottom="100dp" + android:layout_gravity="bottom|right" + android:layout_marginRight="25dp" + android:layout_marginBottom="90dp" android:orientation="vertical" android:visibility="gone"> <LinearLayout @@ -90,8 +90,8 @@ <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="end" - android:layout_marginEnd="80dp" + android:layout_gravity="right" + android:layout_marginRight="80dp" android:src="@drawable/cling_arrow_down" /> </LinearLayout> </FrameLayout> @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="15dp" - android:layout_marginStart="20dp" - android:layout_gravity="bottom|start" + android:layout_marginLeft="20dp" + android:layout_gravity="bottom|left" android:onClick="dismissWorkspaceCling" /> </com.android.launcher3.Cling> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3e2ffce60..d26a73baf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -230,29 +230,29 @@ s --> <string name="apps_customize_widgets_scroll_format">Widgets page %1$d of %2$d</string> <!-- Clings --> - <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> + <!-- The title text for the workspace cling [CHAR_LIMIT=60] --> <string name="first_run_cling_title">Welcome!</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_description">Make yourself at home.</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_custom_content_hint"></string> - <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_search_bar_hint"></string> - <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string> - <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> + <!-- The title text for the workspace cling [CHAR_LIMIT=60] --> <string name="workspace_cling_title">Organize your space</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <!-- The description of how to use the workspace [CHAR_LIMIT=160] --> <string name="workspace_cling_move_item">Touch & hold background to manage wallpaper, widgets and settings.</string> - <!-- The title text for the All Apps cling [CHAR_LIMIT=none] --> + <!-- The title text for the All Apps cling [CHAR_LIMIT=60] --> <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] --> + <!-- The description of how to pick up and add an item to the workspace [CHAR_LIMIT=160] --> <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] --> + <!-- The title text for the Folder cling [CHAR_LIMIT=60] --> <string name="folder_cling_title">Here\'s a folder</string> - <!-- The description of how to create a folder [CHAR_LIMIT=none] --> + <!-- The description of how to create a folder [CHAR_LIMIT=160] --> <string name="folder_cling_create_folder">To create one like this, touch & hold an app, then move it over another.</string> - <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] --> + <!-- The text on the button to dismiss a cling [CHAR_LIMIT=30] --> <string name="cling_dismiss">OK</string> <!-- Error message on dummy custom cling layout [DO NOT TRANSLATE] --> <string name="dummy_custom_cling_error_message">Error: custom workspace layout passed in but custom cling was not overwritten</string> |