Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49ac59cb authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Removing unused cling, tweaking translation character limits (Bug... 

Merge "Removing unused cling, tweaking translation character limits (Bug 11151675)" into jb-ub-now-jetsonic
parents 9789c42e 0091e376

res/layout-land/all_apps_cling.xml

deleted100644 → 0
+0 −48
Original line number Original line Diff line number Diff line 
<?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>

res/layout-port/all_apps_cling.xml

deleted100644 → 0
+0 −48
Original line number Original line Diff line number Diff line 
<?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>

res/layout-sw600dp-port/all_apps_cling.xml

deleted100644 → 0
+0 −50
Original line number Original line Diff line number Diff line 
<?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>

res/layout-sw720dp/all_apps_cling.xml

deleted100644 → 0
+0 −46
Original line number Original line Diff line number Diff line 
<?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>

res/values/strings.xml

+5 −9
Original line number Original line Diff line number Diff line
@@ -238,7 +238,7 @@ s --> 
    <string name="apps_customize_widgets_scroll_format">Widgets page %1$d of %2$d</string>

    <string name="apps_customize_widgets_scroll_format">Widgets page %1$d of %2$d</string>





    <!-- Clings -->

    <!-- 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>

    <string name="first_run_cling_title">Welcome!</string>

    <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->

    <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->

    <string name="first_run_cling_description">Make yourself at home.</string>

    <string name="first_run_cling_description">Make yourself at home.</string>
@@ -248,17 +248,13 @@ s --> 
    <string name="first_run_cling_search_bar_hint"></string>

    <string name="first_run_cling_search_bar_hint"></string>

    <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->

    <!-- 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>

    <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>

    <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 &amp; hold background to manage wallpaper, widgets and settings.</string>

    <string name="workspace_cling_move_item">Touch &amp; hold background to manage wallpaper, widgets and settings.</string>

    <!-- The title text for the All Apps cling [CHAR_LIMIT=60] -->

    <!-- The title text for the Folder cling [CHAR_LIMIT=30] -->

    <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 &amp; hold it.</string>

    <!-- The title text for the Folder cling [CHAR_LIMIT=60] -->

    <string name="folder_cling_title">Here\'s a folder</string>

    <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 &amp; hold an app, then move it over another.</string>

    <string name="folder_cling_create_folder">To create one like this, touch &amp; hold an app, then move it over another.</string>

    <!-- The text on the button to dismiss a cling [CHAR_LIMIT=30] -->

    <!-- The text on the button to dismiss a cling [CHAR_LIMIT=30] -->

    <string name="cling_dismiss">OK</string>

    <string name="cling_dismiss">OK</string>