summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rwxr-xr-xres/drawable-hdpi/ic_arrow_back_grey.pngbin0 -> 190 bytes
-rwxr-xr-xres/drawable-hdpi/ic_search_grey.pngbin0 -> 743 bytes
-rwxr-xr-xres/drawable-mdpi/ic_arrow_back_grey.pngbin0 -> 151 bytes
-rwxr-xr-xres/drawable-mdpi/ic_search_grey.pngbin0 -> 497 bytes
-rwxr-xr-xres/drawable-xhdpi/ic_arrow_back_grey.pngbin0 -> 234 bytes
-rwxr-xr-xres/drawable-xhdpi/ic_search_grey.pngbin0 -> 972 bytes
-rwxr-xr-xres/drawable-xxhdpi/ic_arrow_back_grey.pngbin0 -> 308 bytes
-rwxr-xr-xres/drawable-xxhdpi/ic_search_grey.pngbin0 -> 1473 bytes
-rwxr-xr-xres/drawable-xxxhdpi/ic_arrow_back_grey.pngbin0 -> 359 bytes
-rwxr-xr-xres/drawable-xxxhdpi/ic_search_grey.pngbin0 -> 1996 bytes
-rw-r--r--res/layout/apps_list_view.xml63
-rw-r--r--res/values/dimens.xml1
12 files changed, 49 insertions, 15 deletions
diff --git a/res/drawable-hdpi/ic_arrow_back_grey.png b/res/drawable-hdpi/ic_arrow_back_grey.png
new file mode 100755
index 000000000..ccd3900dd
--- /dev/null
+++ b/res/drawable-hdpi/ic_arrow_back_grey.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_grey.png b/res/drawable-hdpi/ic_search_grey.png
new file mode 100755
index 000000000..f4c5e27d2
--- /dev/null
+++ b/res/drawable-hdpi/ic_search_grey.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_arrow_back_grey.png b/res/drawable-mdpi/ic_arrow_back_grey.png
new file mode 100755
index 000000000..11996efe3
--- /dev/null
+++ b/res/drawable-mdpi/ic_arrow_back_grey.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_grey.png b/res/drawable-mdpi/ic_search_grey.png
new file mode 100755
index 000000000..e83891c11
--- /dev/null
+++ b/res/drawable-mdpi/ic_search_grey.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_arrow_back_grey.png b/res/drawable-xhdpi/ic_arrow_back_grey.png
new file mode 100755
index 000000000..79b9b486c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_arrow_back_grey.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_grey.png b/res/drawable-xhdpi/ic_search_grey.png
new file mode 100755
index 000000000..bd5fdf444
--- /dev/null
+++ b/res/drawable-xhdpi/ic_search_grey.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_arrow_back_grey.png b/res/drawable-xxhdpi/ic_arrow_back_grey.png
new file mode 100755
index 000000000..8e42e091d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_arrow_back_grey.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_search_grey.png b/res/drawable-xxhdpi/ic_search_grey.png
new file mode 100755
index 000000000..1d5c91361
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_search_grey.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_arrow_back_grey.png b/res/drawable-xxxhdpi/ic_arrow_back_grey.png
new file mode 100755
index 000000000..854a9bd1a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_arrow_back_grey.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_search_grey.png b/res/drawable-xxxhdpi/ic_search_grey.png
new file mode 100755
index 000000000..28519fda6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_search_grey.png
Binary files differ
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml
index dfb7b588d..e29cac5e1 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/apps_list_view.xml
@@ -22,22 +22,55 @@
android:elevation="15dp"
android:visibility="gone"
android:focusableInTouchMode="true">
- <EditText
- android:id="@+id/app_search_box"
+ <FrameLayout
+ android:id="@+id/header"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="16dp"
- android:hint="@string/apps_view_search_bar_hint"
- android:maxLines="1"
- android:singleLine="true"
- android:scrollHorizontally="true"
- android:gravity="fill_horizontal"
- android:textSize="16sp"
- android:textColor="#4c4c4c"
- android:textColorHint="#9c9c9c"
- android:imeOptions="actionDone|flagNoExtractUi"
- android:background="@drawable/apps_search_bg"
- android:elevation="4dp" />
+ android:layout_height="52dp"
+ android:orientation="horizontal"
+ android:background="@drawable/apps_search_bg">
+ <LinearLayout
+ android:id="@+id/app_search_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:visibility="invisible">
+ <ImageView
+ android:id="@+id/dismiss_search_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start|center_vertical"
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp"
+ android:contentDescription="@string/all_apps_button_label"
+ android:src="@drawable/ic_arrow_back_grey" />
+ <EditText
+ android:id="@+id/app_search_box"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ android:paddingLeft="8dp"
+ android:hint="@string/apps_view_search_bar_hint"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:scrollHorizontally="true"
+ android:gravity="fill_horizontal"
+ android:textSize="16sp"
+ android:textColor="#4c4c4c"
+ android:textColorHint="#9c9c9c"
+ android:imeOptions="actionDone|flagNoExtractUi"
+ android:background="@android:color/transparent" />
+ </LinearLayout>
+ <ImageView
+ android:id="@+id/search_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end|center_vertical"
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp"
+ android:contentDescription="@string/apps_view_search_bar_hint"
+ android:src="@drawable/ic_search_grey" />
+ </FrameLayout>
<com.android.launcher3.AppsContainerRecyclerView
android:id="@+id/apps_list_view"
android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a57ae89d0..4fbe87e09 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -53,6 +53,7 @@
<!-- Note: This needs to match the fixed insets for the search box -->
<dimen name="apps_container_fixed_bounds_inset">8dp</dimen>
<dimen name="apps_grid_view_start_margin">52dp</dimen>
+ <dimen name="apps_grid_section_y_offset">8dp</dimen>
<dimen name="apps_view_row_height">64dp</dimen>
<dimen name="apps_view_section_text_size">24sp</dimen>
<dimen name="apps_view_fast_scroll_bar_width">6dp</dimen>