diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2015-04-09 17:54:00 -0700 |
---|---|---|
committer | Raj Yengisetty <rajesh@cyngn.com> | 2015-05-12 13:37:38 -0700 |
commit | 7f0a6204f692a1eda48e47a74e0481d6d7bc2191 (patch) | |
tree | a143e80d47a29026f39a35eb06e4dce93a174460 /res/layout/user_folder.xml | |
parent | e301067845dd42ad778f4271e30e244bad457086 (diff) | |
download | android_packages_apps_Trebuchet-7f0a6204f692a1eda48e47a74e0481d6d7bc2191.tar.gz android_packages_apps_Trebuchet-7f0a6204f692a1eda48e47a74e0481d6d7bc2191.tar.bz2 android_packages_apps_Trebuchet-7f0a6204f692a1eda48e47a74e0481d6d7bc2191.zip |
Trebuchet: new folder UI v1
This change adds a number of new UI components and animations for
folders.
Designer: Hayden Schoen
Change-Id: I255cd4664432d84aebecf7e16ace5d9948573e27
Diffstat (limited to 'res/layout/user_folder.xml')
-rw-r--r-- | res/layout/user_folder.xml | 85 |
1 files changed, 41 insertions, 44 deletions
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 3b1e5be7c..2339e7a93 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -13,62 +13,59 @@ See the License for the specific language governing permissions and limitations under the License. --> - <com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/quantum_panel"> + android:paddingStart="@dimen/folder_preview_padding" + android:paddingEnd="@dimen/folder_preview_padding" + android:layout_gravity="center"> + + <ImageView + android:id="@+id/folder_lock" + android:layout_width="@dimen/folder_lock_icon" + android:layout_height="@dimen/folder_lock_icon" + android:paddingBottom="@dimen/folder_name_padding" + android:paddingTop="@dimen/folder_name_padding" + android:paddingLeft="@dimen/folder_name_padding" + android:paddingRight="@dimen/folder_name_padding" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="@dimen/folder_lock_margin" + android:src="@drawable/folder_unlocked" /> <ScrollView android:id="@+id/scroll_view" android:layout_width="match_parent" - android:layout_height="match_parent"> - <com.android.launcher3.CellLayout - android:id="@+id/folder_content" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:cacheColorHint="#ff333333" - android:hapticFeedbackEnabled="false" /> + android:layout_height="match_parent" + android:layout_gravity="center_horizontal"> + <com.android.launcher3.CellLayout + android:id="@+id/folder_content" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:cacheColorHint="#ff333333" + android:hapticFeedbackEnabled="false" /> </ScrollView> - <RelativeLayout - android:id="@+id/folder_title_section" - android:layout_width="match_parent" + <com.android.launcher3.FolderEditText + android:id="@+id/folder_name" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <ImageView - android:id="@+id/folder_lock" - android:layout_width="@dimen/folder_lock_icon" - android:layout_height="@dimen/folder_lock_icon" - android:paddingBottom="@dimen/folder_name_padding" - android:paddingTop="@dimen/folder_name_padding" - android:adjustViewBounds="true" - android:layout_alignParentRight="true" - android:src="@drawable/folder_unlock" /> - - <com.android.launcher3.FolderEditText - android:id="@+id/folder_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:background="#00000000" - android:fontFamily="sans-serif-condensed" - android:gravity="center_horizontal" - android:hint="@string/folder_hint_text" - android:imeOptions="flagNoExtractUi" - android:paddingBottom="@dimen/folder_name_padding" - android:paddingTop="@dimen/folder_name_padding" - android:singleLine="true" - android:textColor="#ff777777" - android:textColorHighlight="#ffCCCCCC" - android:textCursorDrawable="@null" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@id/folder_lock" - android:textSize="16sp" /> - </RelativeLayout> + android:layout_centerHorizontal="true" + android:background="#00000000" + android:fontFamily="sans-serif-condensed" + android:gravity="center_horizontal" + android:layout_gravity="center_horizontal" + android:hint="@string/folder_hint_text" + android:imeOptions="flagNoExtractUi" + android:paddingBottom="@dimen/folder_name_padding" + android:paddingTop="@dimen/folder_name_padding" + android:singleLine="true" + android:textColor="@color/workspace_icon_text_color" + android:textColorHighlight="#ffCCCCCC" + android:textColorHint="#78ffffff" + android:textCursorDrawable="@null" + android:textSize="20sp" /> </com.android.launcher3.Folder> |