diff options
author | Winson Chung <winsonc@google.com> | 2013-10-09 15:50:52 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-10-09 17:53:32 -0700 |
commit | 3a6e7f330e680ef718ca7c0921d842efb4d8bbae (patch) | |
tree | 260e400c897a77d6727e5ea5f933864fa2ac1ace /res | |
parent | 558f1c2ac73c3a0c3c0c316222b6b7f9c76e2501 (diff) | |
download | android_packages_apps_Trebuchet-3a6e7f330e680ef718ca7c0921d842efb4d8bbae.tar.gz android_packages_apps_Trebuchet-3a6e7f330e680ef718ca7c0921d842efb4d8bbae.tar.bz2 android_packages_apps_Trebuchet-3a6e7f330e680ef718ca7c0921d842efb4d8bbae.zip |
Initial changes for new clings. (Bug 11142616)
Change-Id: Id66ebceb99449941921d9e617dfe0cc05a2e3b65
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-port/workspace_cling.xml | 60 | ||||
-rw-r--r-- | res/values/styles.xml | 1 |
2 files changed, 49 insertions, 12 deletions
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index db33db06f..e61340eae 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -22,20 +22,15 @@ <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: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 +51,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|end" + android:layout_marginEnd="25dp" + android:layout_marginBottom="100dp" + 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="end" + android:layout_marginEnd="80dp" + 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_marginStart="20dp" + android:layout_gravity="bottom|start" android:onClick="dismissWorkspaceCling" /> </com.android.launcher3.Cling> diff --git a/res/values/styles.xml b/res/values/styles.xml index 42704df29..c74d50899 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -59,7 +59,6 @@ <item name="android:layout_height">wrap_content</item> <item name="android:textSize">24sp</item> <item name="android:textColor">#49C0EC</item> - <item name="android:fontFamily">sans-serif-condensed</item> </style> <style name="ClingText"> <item name="android:layout_width">wrap_content</item> |