diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-13 03:25:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 03:25:37 +0000 |
| commit | bfcb652c77fe47fe75115ca299eac93217677e1c (patch) | |
| tree | fe1ac218d27345346650e186841ab8764404cf11 /res | |
| parent | f13586eae96771fde7a4dea26d1d07a3e27d19fd (diff) | |
| parent | b7e15adc7b67cb1d70ca72014b200dd6cbbf166a (diff) | |
| download | android_packages_apps_Trebuchet-bfcb652c77fe47fe75115ca299eac93217677e1c.tar.gz android_packages_apps_Trebuchet-bfcb652c77fe47fe75115ca299eac93217677e1c.tar.bz2 android_packages_apps_Trebuchet-bfcb652c77fe47fe75115ca299eac93217677e1c.zip | |
Merge "Animating the folder title & page indicator when a multi-page folder is opened for the first time" into ub-launcher3-burnaby
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/user_folder.xml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 5bacc9605..ab349179c 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -45,20 +45,16 @@ android:id="@+id/folder_footer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > - - <include - android:id="@+id/folder_page_indicator" - android:layout_width="wrap_content" - android:layout_height="12dp" - android:layout_gravity="center_horizontal" - layout="@layout/page_indicator" /> + android:orientation="horizontal" + android:paddingLeft="8dp" + android:paddingRight="8dp" > <com.android.launcher3.FolderEditText android:id="@+id/folder_name" - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_weight="1" android:background="#00000000" android:fontFamily="sans-serif-condensed" android:gravity="center_horizontal" @@ -72,6 +68,13 @@ android:textColorHint="#ff808080" android:textCursorDrawable="@null" android:textSize="14sp" /> + + <include + android:id="@+id/folder_page_indicator" + android:layout_width="wrap_content" + android:layout_height="12dp" + android:layout_gravity="center_vertical" + layout="@layout/page_indicator" /> </LinearLayout> </com.android.launcher3.Folder>
\ No newline at end of file |