diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-29 13:14:14 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-08 14:55:22 -0800 |
commit | 0ac7ede56afebe4401c0636196f5844be573ad68 (patch) | |
tree | c4bdfce0b5f788880354845ab51ae293bd608d1b /res/layout/all_apps.xml | |
parent | 0e0498031092488ff166145c12ce36cc0a80c490 (diff) | |
download | android_packages_apps_Trebuchet-0ac7ede56afebe4401c0636196f5844be573ad68.tar.gz android_packages_apps_Trebuchet-0ac7ede56afebe4401c0636196f5844be573ad68.tar.bz2 android_packages_apps_Trebuchet-0ac7ede56afebe4401c0636196f5844be573ad68.zip |
Merging search bar with all apps
Change-Id: I78577124cd3c05d52669c3e52b0294d6eb1d194d
Diffstat (limited to 'res/layout/all_apps.xml')
-rw-r--r-- | res/layout/all_apps.xml | 82 |
1 files changed, 57 insertions, 25 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 1bf54eefb..c2b1e6fef 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -18,40 +18,72 @@ will bake the left/right padding into that view's background itself. --> <com.android.launcher3.allapps.AllAppsContainerView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/apps_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + launcher:revealBackground="@drawable/quantum_panel_shape"> - <!-- Both android:focusable and android:focusableInTouchMode are needed for - the view to get focus change events. --> - <FrameLayout - android:id="@+id/search_box_container" + <View + android:id="@+id/reveal_view" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" + android:focusable="false" + android:elevation="2dp" + android:visibility="invisible" /> + + + <com.android.launcher3.allapps.AllAppsRecyclerViewContainerView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/main_content" + android:visibility="gone" + android:layout_gravity="center" android:focusable="true" android:focusableInTouchMode="true" - android:visibility="gone" /> + android:elevation="15dp" > - <FrameLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> - <FrameLayout - android:id="@+id/all_apps_reveal" + <!-- DO NOT CHANGE THE ID --> + <com.android.launcher3.allapps.AllAppsRecyclerView + android:id="@+id/apps_list_view" + android:theme="@style/Theme.Light.CustomOverscroll" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:focusable="false" - android:elevation="2dp" - android:visibility="invisible" /> - <include - layout="@layout/all_apps_container" - android:id="@+id/all_apps_container" + android:layout_gravity="center_horizontal|top" + android:clipToPadding="false" + android:focusable="true" + android:layout_marginTop="@dimen/all_apps_search_bar_height" + android:descendantFocusability="afterDescendants" /> + + <LinearLayout + android:id="@+id/search_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:visibility="gone" /> - </FrameLayout> + android:layout_height="@dimen/all_apps_search_bar_height" + android:layout_gravity="start|top" + android:orientation="horizontal" + android:background="@drawable/all_apps_search_bg" > + + <com.android.launcher3.ExtendedEditText + android:id="@+id/search_box_input" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent" + android:focusableInTouchMode="true" + android:gravity="fill_horizontal|center_vertical" + android:hint="@string/all_apps_search_bar_hint" + android:inputType="text|textNoSuggestions|textCapWords" + android:imeOptions="actionSearch|flagNoExtractUi" + android:maxLines="1" + android:scrollHorizontally="true" + android:layout_marginLeft="@dimen/container_fastscroll_thumb_max_width" + android:layout_marginRight="@dimen/container_fastscroll_thumb_max_width" + android:singleLine="true" + android:textColor="#4c4c4c" + android:textColorHint="#9c9c9c" + android:textSize="16sp" /> + </LinearLayout> + + </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView> </com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file |