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

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

Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit

parents 1ba0a30e 205cd772

res/layout-land/folder_cling.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<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="folder_portrait">

    launcher:drawIdentifier="folder_landscape">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -25,6 +25,7 @@ 
        android:layout_marginTop="10dp"

        android:layout_marginBottom="10dp">

        <LinearLayout

            android:id="@+id/folder_bubble"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">
@@ -59,6 +60,6 @@ 
        android:id="@+id/cling_dismiss"

        android:layout_marginBottom="15dp"

        android:layout_marginEnd="20dp"

        android:layout_gravity="bottom|end"

        android:layout_gravity="bottom|right"

        android:onClick="dismissFolderCling" />

</com.android.launcher3.Cling>

res/layout-land/launcher.xml

+10 −1
Original line number Diff line number Diff line
@@ -65,12 +65,21 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone" />

        <include layout="@layout/migration_cling"

            android:id="@+id/migration_cling"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone" />

        <include layout="@layout/migration_workspace_cling"

            android:id="@+id/migration_workspace_cling"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone" />

        <include layout="@layout/workspace_cling"

            android:id="@+id/workspace_cling"

            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"

res/layout-land/migration_workspace_cling.xml

+15 −16
Original line number Diff line number Diff line
@@ -19,25 +19,26 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    launcher:drawIdentifier="migration_workspace_landscape">

    <FrameLayout

    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_width="400dp"

        android:layout_height="wrap_content"

        android:layout_gravity="end|center_vertical"

        android:paddingEnd="60dp"

        android:orientation="vertical">

        <LinearLayout

            android:id="@+id/migration_workspace_cling_bubble"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom"

            android:layout_marginStart="25dp"

            android:layout_marginEnd="25dp"

            android:orientation="vertical">

            android:orientation="horizontal">

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginRight="4dp"

                android:paddingLeft="20dp"

                android:paddingRight="20dp"

                android:paddingTop="20dp"

                android:paddingBottom="20dp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:background="@drawable/cling">

                <TextView
@@ -54,17 +55,15 @@ 
            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:src="@drawable/cling_arrow_down" />

                android:layout_gravity="center_vertical"

                android:src="@drawable/cling_arrow_end" />

        </LinearLayout>



        <Button

            style="@style/ClingButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="15dp"

            android:layout_marginRight="20dp"

            android:layout_gravity="bottom|right"

            android:layout_marginTop="5dp"

            android:layout_gravity="right"

            android:onClick="dismissMigrationWorkspaceCling" />

    </FrameLayout>

    </LinearLayout>

</com.android.launcher3.Cling>

res/layout-land/workspace_cling.xml

+51 −12
Original line number Diff line number Diff line
@@ -18,24 +18,20 @@ 
    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    launcher:drawIdentifier="workspace_portrait">

    launcher:drawIdentifier="workspace_landscape">

    <FrameLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginStart="25dp"

        android:layout_marginEnd="25dp"

        android:layout_marginTop="310dp">

        android:layout_height="match_parent">

        <LinearLayout

            android:id="@+id/workspace_cling_bubble"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="top"

            android:layout_marginStart="25dp"

            android:layout_marginEnd="25dp"

            android:layout_marginTop="30dp"

            android:orientation="vertical">

            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:src="@drawable/cling_arrow_up" />

            <LinearLayout

                android:paddingLeft="20dp"

                android:paddingRight="20dp"
@@ -56,14 +52,57 @@ 
                    android:layout_height="wrap_content"

                    android:text="@string/workspace_cling_move_item" />

            </LinearLayout>

            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:src="@drawable/cling_arrow_down" />

        </LinearLayout>



        <LinearLayout

            android:id="@+id/focused_hotseat_app_bubble"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom|left"

            android:layout_marginLeft="25dp"

            android:layout_marginBottom="90dp"

            android:orientation="vertical"

            android:visibility="gone">

            <LinearLayout

                android:paddingLeft="20dp"

                android:paddingRight="20dp"

                android:paddingTop="20dp"

                android:paddingBottom="20dp"

                android:layout_width="240dp"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:background="@drawable/cling">

                <TextView

                    android:id="@+id/focused_hotseat_app_title"

                    style="@style/ClingTitleText"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content" />

                <TextView

                    android:id="@+id/focused_hotseat_app_description"

                    style="@style/ClingText"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content" />

            </LinearLayout>

            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="left"

                android:layout_marginLeft="78dp"

                android:src="@drawable/cling_arrow_down" />

        </LinearLayout>

    </FrameLayout>



    <Button

        style="@style/ClingButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="15dp"

        android:layout_marginEnd="20dp"

        android:layout_gravity="bottom|end"

        android:layout_marginRight="20dp"

        android:layout_gravity="bottom|right"

        android:onClick="dismissWorkspaceCling" />

</com.android.launcher3.Cling>

res/layout-port/folder_cling.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
        android:layout_marginTop="10dp"

        android:layout_marginBottom="10dp">

        <LinearLayout

            android:id="@+id/folder_bubble"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">
@@ -59,6 +60,6 @@ 
        android:id="@+id/cling_dismiss"

        android:layout_marginBottom="15dp"

        android:layout_marginEnd="20dp"

        android:layout_gravity="bottom|end"

        android:layout_gravity="bottom|right"

        android:onClick="dismissFolderCling" />

</com.android.launcher3.Cling>