diff options
author | Winson Chung <winsonc@google.com> | 2013-09-21 00:23:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-21 00:23:22 +0000 |
commit | 49ff36f1f12be127034ee59a27ed80e35cf36117 (patch) | |
tree | 733823b5c5a2352b18361897f6df140e499d3f4a /res/layout-port/workspace_cling.xml | |
parent | 5108bc0fd9f7e30c87c223fbb75f024e271b2103 (diff) | |
parent | af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0 (diff) | |
download | android_packages_apps_Trebuchet-49ff36f1f12be127034ee59a27ed80e35cf36117.tar.gz android_packages_apps_Trebuchet-49ff36f1f12be127034ee59a27ed80e35cf36117.tar.bz2 android_packages_apps_Trebuchet-49ff36f1f12be127034ee59a27ed80e35cf36117.zip |
Merge "Initial changes to restore clings." into jb-ub-now-indigo-rose
Diffstat (limited to 'res/layout-port/workspace_cling.xml')
-rw-r--r-- | res/layout-port/workspace_cling.xml | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index 052e1a091..38d385896 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -20,43 +20,51 @@ android:layout_height="match_parent" launcher:drawIdentifier="workspace_portrait"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - android:layout_marginTop="90dp"> + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="120dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="bottom" android:orientation="vertical"> - <TextView - style="@style/ClingTitleText" + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" + android:layout_gravity="center_horizontal" + android:src="@drawable/cling_arrow_up" /> + <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/workspace_cling_move_item" /> + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + </LinearLayout> </LinearLayout> </FrameLayout> - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - android:layout_marginBottom="130dp" - android:layout_gravity="bottom" - android:gravity="center" - android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" + android:layout_marginEnd="20dp" android:layout_gravity="bottom|end" android:onClick="dismissWorkspaceCling" /> </com.android.launcher3.Cling> |