diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-03-17 22:05:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-17 22:05:00 +0000 |
| commit | db9a6ce1b86ed76fc911ac0af502adffc432a88c (patch) | |
| tree | 45a88dc07b86971d6deebc0daddd547ec4e0ff47 /res | |
| parent | a335f3b514a5450fe4dd890532e7842d59644cab (diff) | |
| parent | 5d85c44fd873c740dc191b28424c2ee367d730a2 (diff) | |
| download | android_packages_apps_Trebuchet-db9a6ce1b86ed76fc911ac0af502adffc432a88c.tar.gz android_packages_apps_Trebuchet-db9a6ce1b86ed76fc911ac0af502adffc432a88c.tar.bz2 android_packages_apps_Trebuchet-db9a6ce1b86ed76fc911ac0af502adffc432a88c.zip | |
am 5d85c44f: Adding sort switch in FolderPagedView
* commit '5d85c44fd873c740dc191b28424c2ee367d730a2':
Adding sort switch in FolderPagedView
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/user_folder_scroll.xml | 34 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 33 insertions, 3 deletions
diff --git a/res/layout/user_folder_scroll.xml b/res/layout/user_folder_scroll.xml index 421e426cb..12e5097f3 100644 --- a/res/layout/user_folder_scroll.xml +++ b/res/layout/user_folder_scroll.xml @@ -45,7 +45,9 @@ android:id="@+id/folder_footer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal" + android:paddingStart="12dp" + android:paddingEnd="8dp" > <com.android.launcher3.FolderEditText android:id="@+id/folder_name" @@ -55,7 +57,7 @@ android:layout_weight="1" android:background="#00000000" android:fontFamily="sans-serif-condensed" - android:gravity="center_horizontal" + android:gravity="start" android:hint="@string/folder_hint_text" android:imeOptions="flagNoExtractUi" android:paddingBottom="@dimen/folder_name_padding" @@ -71,8 +73,34 @@ android:id="@+id/folder_page_indicator" android:layout_width="wrap_content" android:layout_height="12dp" - android:layout_gravity="center_vertical" + android:layout_gravity="top" + android:layout_marginTop="5dp" layout="@layout/page_indicator" /> + + <LinearLayout + android:id="@+id/folder_sort" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:gravity="end|center_vertical" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:text="@string/sort_alphabetical" + android:textColor="#ff777777" + android:textSize="14sp" /> + + <Switch + android:id="@+id/folder_sort_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:duplicateParentState="true" + android:focusable="false" /> + </LinearLayout> </LinearLayout> </com.android.launcher3.Folder>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index a1e460183..0b34d00a8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -89,6 +89,8 @@ <string name="rename_action">OK</string> <!-- Buttons in Rename folder dialog box --> <string name="cancel_action">Cancel</string> + <!-- Label for button to sort folder contents. [CHAR_LIMIT=10] --> + <string name="sort_alphabetical">A-Z</string> <!-- Shortcuts --> <skip /> |