diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-09 14:17:14 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-04-09 14:19:33 -0700 |
| commit | b863415c17aaaf6012647df5ed14803f89f94bcb (patch) | |
| tree | dbe68900ecb4360c354c142c10e0ad5b7be966e0 /res/layout/user_folder.xml | |
| parent | 3f471440a8b6b71d4c15501a96befd3b715c9e8f (diff) | |
| download | android_packages_apps_Trebuchet-b863415c17aaaf6012647df5ed14803f89f94bcb.tar.gz android_packages_apps_Trebuchet-b863415c17aaaf6012647df5ed14803f89f94bcb.tar.bz2 android_packages_apps_Trebuchet-b863415c17aaaf6012647df5ed14803f89f94bcb.zip | |
Updating folder UI
> Removing 2 folder content implementations and merging unscrollable
content into FolderPagedView
> Disaling folder sorting
> Fixing pageIndicator height
Change-Id: I36e35e311eaf99b6c69d450c0765bd41b2d68738
Diffstat (limited to 'res/layout/user_folder.xml')
| -rw-r--r-- | res/layout/user_folder.xml | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 7a4d5e881..cd3a051ad 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2008 The Android Open Source Project + Copyright (C) 2015 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,30 +34,44 @@ android:layout_width="20dp" android:layout_height="20dp" /> - <com.android.launcher3.FolderCellLayout + <com.android.launcher3.FolderPagedView android:id="@+id/folder_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:cacheColorHint="#ff333333" - android:hapticFeedbackEnabled="false" /> + launcher:pageIndicator="@+id/folder_page_indicator" /> </FrameLayout> - <com.android.launcher3.FolderEditText - android:id="@+id/folder_name" + <LinearLayout + android:id="@+id/folder_footer" android:layout_width="match_parent" android:layout_height="wrap_content" - 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:textColorHint="#ff808080" - android:textCursorDrawable="@null" - android:textSize="14sp" /> + 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" /> + + <com.android.launcher3.FolderEditText + android:id="@+id/folder_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + 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:textColorHint="#ff808080" + android:textCursorDrawable="@null" + android:textSize="14sp" /> + </LinearLayout> </com.android.launcher3.Folder>
\ No newline at end of file |