diff options
author | Winson Chung <winsonc@google.com> | 2013-10-22 14:40:17 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-10-22 14:40:17 -0700 |
commit | 0091e3766e25d5273be32e5270834e22bb62c9aa (patch) | |
tree | e163379c84c82b32a700c10d71d377726d0f9148 /res | |
parent | 4f98332b98bbe95cb0574e51ef1514bade9a5e76 (diff) | |
download | android_packages_apps_Trebuchet-0091e3766e25d5273be32e5270834e22bb62c9aa.tar.gz android_packages_apps_Trebuchet-0091e3766e25d5273be32e5270834e22bb62c9aa.tar.bz2 android_packages_apps_Trebuchet-0091e3766e25d5273be32e5270834e22bb62c9aa.zip |
Removing unused cling, tweaking translation character limits (Bug 11151675)
Change-Id: I601d92ecca5a479d7778824e3b120634bdae6a45
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/all_apps_cling.xml | 48 | ||||
-rw-r--r-- | res/layout-port/all_apps_cling.xml | 48 | ||||
-rw-r--r-- | res/layout-sw600dp-port/all_apps_cling.xml | 50 | ||||
-rw-r--r-- | res/layout-sw720dp/all_apps_cling.xml | 46 | ||||
-rw-r--r-- | res/values/strings.xml | 14 |
5 files changed, 5 insertions, 201 deletions
diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml deleted file mode 100644 index 820f00a6d..000000000 --- a/res/layout-land/all_apps_cling.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?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.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_landscape"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="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/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_marginEnd="10dp" - android:layout_gravity="bottom|end" - android:onClick="dismissAllAppsCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml deleted file mode 100644 index 62284ec73..000000000 --- a/res/layout-port/all_apps_cling.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?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.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_portrait"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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="15dp" - android:layout_marginEnd="10dp" - android:layout_gravity="bottom|end" - android:onClick="dismissAllAppsCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml deleted file mode 100644 index cf65e410d..000000000 --- a/res/layout-sw600dp-port/all_apps_cling.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?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.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_portrait"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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:minWidth="168dp" - android:textSize="24sp" - android:layout_marginTop="235dp" - android:layout_marginEnd="36dp" - android:layout_gravity="top|end" - android:onClick="dismissAllAppsCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml deleted file mode 100644 index 824d84f0d..000000000 --- a/res/layout-sw720dp/all_apps_cling.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?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.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="all_apps_large"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/cling_text_block_offset_x" - android:layout_marginTop="@dimen/cling_text_block_offset_y"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="15dp" - android:onClick="dismissAllAppsCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/values/strings.xml b/res/values/strings.xml index cafa42442..f916ad8a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -230,7 +230,7 @@ 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=60] --> + <!-- The title text for the workspace cling [CHAR_LIMIT=30] --> <string name="first_run_cling_title">Welcome!</string> <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_description">Make yourself at home.</string> @@ -240,17 +240,13 @@ s --> <string name="first_run_cling_search_bar_hint"></string> <!-- 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=60] --> + <!-- The title text for the workspace cling [CHAR_LIMIT=30] --> <string name="workspace_cling_title">Organize your space</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=160] --> + <!-- The description of how to use the workspace [CHAR_LIMIT=70] --> <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=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=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=60] --> + <!-- The title text for the Folder cling [CHAR_LIMIT=30] --> <string name="folder_cling_title">Here\'s a folder</string> - <!-- The description of how to create a folder [CHAR_LIMIT=160] --> + <!-- The description of how to create a folder [CHAR_LIMIT=70] --> <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=30] --> <string name="cling_dismiss">OK</string> |