diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-09 23:40:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 23:40:00 +0000 |
commit | 172fee6354ce4ac36beb7c9788036b7a31d7da08 (patch) | |
tree | 5247d98e099a570248479b96467b4ceea1c67b85 /res | |
parent | 025acebee92750659478c46c67e0e5fe8e53cad4 (diff) | |
parent | 557280c116db54ed2100eb0815e6d539d2b58252 (diff) | |
download | android_packages_apps_Trebuchet-172fee6354ce4ac36beb7c9788036b7a31d7da08.tar.gz android_packages_apps_Trebuchet-172fee6354ce4ac36beb7c9788036b7a31d7da08.tar.bz2 android_packages_apps_Trebuchet-172fee6354ce4ac36beb7c9788036b7a31d7da08.zip |
am 557280c1: Merge "Updating folder UI" into ub-launcher3-burnaby
* commit '557280c116db54ed2100eb0815e6d539d2b58252':
Updating folder UI
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/page_indicator_marker.xml | 4 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 52 | ||||
-rw-r--r-- | res/layout/user_folder_scroll.xml | 106 |
3 files changed, 35 insertions, 127 deletions
diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml index 686d27569..564a95811 100644 --- a/res/layout/page_indicator_marker.xml +++ b/res/layout/page_indicator_marker.xml @@ -16,8 +16,8 @@ <com.android.launcher3.PageIndicatorMarker xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" - android:layout_width="16dp" - android:layout_height="16dp" + android:layout_width="12dp" + android:layout_height="12dp" android:layout_gravity="center_vertical"> <ImageView android:id="@+id/inactive" 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 diff --git a/res/layout/user_folder_scroll.xml b/res/layout/user_folder_scroll.xml deleted file mode 100644 index 12e5097f3..000000000 --- a/res/layout/user_folder_scroll.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/quantum_panel" - android:orientation="vertical" > - - <FrameLayout - android:id="@+id/folder_content_wrapper" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <!-- Actual size of the indicator doesn't matter as it is scaled to match the view size --> - - <com.android.launcher3.FocusIndicatorView - android:id="@+id/focus_indicator" - android:layout_width="20dp" - android:layout_height="20dp" /> - - <com.android.launcher3.FolderPagedView - android:id="@+id/folder_content" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:pageIndicator="@+id/folder_page_indicator" /> - </FrameLayout> - - <LinearLayout - android:id="@+id/folder_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingStart="12dp" - android:paddingEnd="8dp" > - - <com.android.launcher3.FolderEditText - android:id="@+id/folder_name" - 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="start" - 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" /> - - <include - android:id="@+id/folder_page_indicator" - android:layout_width="wrap_content" - android:layout_height="12dp" - 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 |