diff options
author | Winson Chung <winsonc@google.com> | 2013-09-26 17:45:32 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-26 18:29:08 -0700 |
commit | fa54513308ef60ffcd7eec8e1ce92120a643b88e (patch) | |
tree | 9dffe8a44b4f7dfeab5d2b9e9518448b1d8b1894 /res/layout-port | |
parent | a709954065c174b53b8ba788fc45c0f350799300 (diff) | |
download | packages_apps_Trebuchet-fa54513308ef60ffcd7eec8e1ce92120a643b88e.tar.gz packages_apps_Trebuchet-fa54513308ef60ffcd7eec8e1ce92120a643b88e.tar.bz2 packages_apps_Trebuchet-fa54513308ef60ffcd7eec8e1ce92120a643b88e.zip |
Tweaking folder cling to support large folders.
Change-Id: I3c500463fba8db71807ad4fc27c6923f3e1d0770
Diffstat (limited to 'res/layout-port')
-rw-r--r-- | res/layout-port/folder_cling.xml | 42 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 6 |
2 files changed, 21 insertions, 27 deletions
diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml index bd4b5e2b1..1f4a115af 100644 --- a/res/layout-port/folder_cling.xml +++ b/res/layout-port/folder_cling.xml @@ -20,39 +20,29 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/folder_cling_title" - android:text="@string/folder_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/folder_cling_create_folder" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/folder_cling_create_folder" /> - </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/cling_arrow_down" /> + android:text="@string/folder_cling_create_folder" /> </LinearLayout> </FrameLayout> <Button diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index faef7a594..ef2f3ace1 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -64,6 +64,11 @@ <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on top of that view. --> + <FrameLayout + android:id="@+id/cling_scrim" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <include layout="@layout/first_run_cling" android:id="@+id/first_run_cling" android:layout_width="match_parent" @@ -74,7 +79,6 @@ 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" |