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 | |
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')
-rw-r--r-- | res/drawable/all_apps_search_bg.xml | 26 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout/all_apps.xml | 82 | ||||
-rw-r--r-- | res/layout/widgets_view.xml | 41 | ||||
-rw-r--r-- | res/values/attrs.xml | 7 | ||||
-rw-r--r-- | res/values/dimens.xml | 17 | ||||
-rw-r--r-- | res/values/strings.xml | 2 |
9 files changed, 126 insertions, 55 deletions
diff --git a/res/drawable/all_apps_search_bg.xml b/res/drawable/all_apps_search_bg.xml index a09f88fd4..5a2c9e836 100644 --- a/res/drawable/all_apps_search_bg.xml +++ b/res/drawable/all_apps_search_bg.xml @@ -14,7 +14,25 @@ See the License for the specific language governing permissions and limitations under the License. --> -<inset xmlns:android="http://schemas.android.com/apk/res/android" - android:drawable="@drawable/quantum_panel" - android:insetTop="@dimen/container_bounds_minus_quantum_panel_padding_inset" - android:insetBottom="@dimen/container_bounds_minus_quantum_panel_padding_inset" />
\ No newline at end of file +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/quantum_panel_bg_color" /> + <corners + android:topLeftRadius="2dp" + android:topRightRadius="2dp" /> + </shape> + </item> + <item + android:top="@dimen/all_apps_search_bar_bg_overflow" + android:left="@dimen/all_apps_search_bar_bg_overflow" + android:right="@dimen/all_apps_search_bar_bg_overflow" + android:bottom="0dp"> + + <shape android:shape="rectangle"> + <stroke + android:width="@dimen/all_apps_search_bar_divider_width" + android:color="#1E000000"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 6500ebcd2..1a951f1b7 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -25,6 +25,8 @@ <com.android.launcher3.DragLayer android:id="@+id/drag_layer" + android:clipChildren="false" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index d0772ee70..8bf9d6427 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -26,6 +26,8 @@ <com.android.launcher3.DragLayer android:id="@+id/drag_layer" + android:clipChildren="false" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 802922ec1..2fc62c500 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -25,6 +25,8 @@ <com.android.launcher3.DragLayer android:id="@+id/drag_layer" + android:clipChildren="false" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent"> 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 diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 755634f82..e64f83ae1 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -18,34 +18,29 @@ will bake the left/right padding into that view's background itself. --> <com.android.launcher3.widget.WidgetsContainerView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/widgets_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:descendantFocusability="afterDescendants"> + android:descendantFocusability="afterDescendants" + launcher:revealBackground="@drawable/quantum_panel_shape_dark"> - <FrameLayout - android:id="@+id/content" + <View + android:id="@+id/reveal_view" android:layout_width="match_parent" - android:layout_height="match_parent"> - <FrameLayout - android:id="@+id/widgets_reveal_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:focusable="false" - android:elevation="2dp" - android:visibility="invisible" /> + android:layout_height="match_parent" + android:layout_gravity="center" + android:focusable="false" + android:elevation="2dp" + android:visibility="invisible" /> - <!-- DO NOT CHANGE THE ID --> - <com.android.launcher3.widget.WidgetsRecyclerView - android:id="@+id/widgets_list_view" - android:theme="@style/Theme.Dark.CustomOverscroll" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:elevation="15dp" - android:visibility="gone" /> - </FrameLayout> + <com.android.launcher3.widget.WidgetsRecyclerView + android:id="@+id/main_content" + android:theme="@style/Theme.Dark.CustomOverscroll" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:elevation="15dp" + android:visibility="gone" /> </com.android.launcher3.widget.WidgetsContainerView>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 827332ad7..82f33d1c0 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -83,6 +83,13 @@ <attr name="pageIndicator" format="reference" /> </declare-styleable> + <!-- BaseContainerView specific attributes. These attributes are used to customize + AllApps view and WidgetsView in xml. --> + <declare-styleable name="BaseContainerView"> + <!-- Drawable to use for the reveal animation --> + <attr name="revealBackground" format="reference" /> + </declare-styleable> + <!-- XML attributes used by default_workspace.xml --> <declare-styleable name="Favorite"> <attr name="className" format="string" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 076853e8d..a303daba8 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -77,7 +77,7 @@ <dimen name="all_apps_grid_view_start_margin">0dp</dimen> <dimen name="all_apps_grid_section_y_offset">8dp</dimen> <dimen name="all_apps_grid_section_text_size">24sp</dimen> - <dimen name="all_apps_search_bar_height">48dp</dimen> + <dimen name="all_apps_search_bar_height">60dp</dimen> <dimen name="all_apps_search_bar_prediction_bar_padding">8dp</dimen> <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen> <dimen name="all_apps_icon_width_gap">24dp</dimen> @@ -90,7 +90,20 @@ <dimen name="all_apps_background_canvas_width">700dp</dimen> <dimen name="all_apps_background_canvas_height">475dp</dimen> -<!-- Widget tray --> + <!-- Search bar in All Apps --> + <dimen name="all_apps_header_max_elevation">4dp</dimen> + <dimen name="all_apps_header_scroll_to_elevation">16dp</dimen> + <dimen name="all_apps_header_shadow_height">6dp</dimen> + + <!-- The overflow is used to create a bottom border, by drawing other three sides + outside the bounds. Ensure that: + all_apps_search_bar_bg_overflow < (-3 * all_apps_search_bar_divider_width) + -6dp is picked at random, any smaller value would do. + --> + <dimen name="all_apps_search_bar_bg_overflow">-6dp</dimen> + <dimen name="all_apps_search_bar_divider_width">1dp</dimen> + + <!-- Widget tray --> <dimen name="widget_container_inset">8dp</dimen> <dimen name="widget_preview_label_vertical_padding">8dp</dimen> <dimen name="widget_preview_label_horizontal_padding">8dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6daa4526c..2838a22f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -56,7 +56,7 @@ <!-- All Apps --> <!-- Search bar text in the apps view. [CHAR_LIMIT=50] --> - <string name="all_apps_search_bar_hint">Search Apps</string> + <string name="all_apps_search_bar_hint">Search Apps…</string> <!-- Loading apps text. [CHAR_LIMIT=50] --> <string name="all_apps_loading_message">Loading Apps…</string> <!-- No-search-results text. [CHAR_LIMIT=50] --> |