diff options
author | Winson Chung <winsonc@google.com> | 2014-01-15 14:31:59 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2014-01-16 14:26:07 -0800 |
commit | 205cd7727f3bd8b65892c580e6f243464878fe6e (patch) | |
tree | 603e323173787cae0bf5c4d882b73265c00bd904 /res/layout-land | |
parent | 230cbf831cbbe8aaa6eaff976f755a8adf5e1708 (diff) | |
download | packages_apps_Trebuchet-205cd7727f3bd8b65892c580e6f243464878fe6e.tar.gz packages_apps_Trebuchet-205cd7727f3bd8b65892c580e6f243464878fe6e.tar.bz2 packages_apps_Trebuchet-205cd7727f3bd8b65892c580e6f243464878fe6e.zip |
Updating Tablet clings. (Bug 11973614)
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
Diffstat (limited to 'res/layout-land')
-rw-r--r-- | res/layout-land/folder_cling.xml | 5 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 11 | ||||
-rw-r--r-- | res/layout-land/migration_workspace_cling.xml | 31 | ||||
-rw-r--r-- | res/layout-land/workspace_cling.xml | 63 |
4 files changed, 79 insertions, 31 deletions
diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml index 86286d71b..5dd372973 100644 --- a/res/layout-land/folder_cling.xml +++ b/res/layout-land/folder_cling.xml @@ -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> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 2880c18bf..779160925 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -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" diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml index bf7075b3d..2d7194075 100644 --- a/res/layout-land/migration_workspace_cling.xml +++ b/res/layout-land/migration_workspace_cling.xml @@ -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> diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index db33db06f..d3b07d74d 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/workspace_cling.xml @@ -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> |