Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e17f4651 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "SEARCH_INTEGRATE" into sc-dev 

* changes:
  Add a WidgetsSearchBar(Launcher3) and a WidgetsSearchController.
  Have a recycler view to show search results.
parents 5e7c89c3 d07acba0

res/drawable/ic_gm_close_24.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="?android:attr/textColorTertiary"

        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>

</vector>

res/layout/widgets_full_sheet.xml

+8 −0
Original line number Diff line number Diff line
@@ -51,5 +51,13 @@ 
            android:layout_alignParentEnd="true"

            android:layout_alignParentTop="true"

            android:layout_marginEnd="@dimen/fastscroll_end_margin" />



        <com.android.launcher3.widget.picker.WidgetsRecyclerView

            android:id="@+id/search_widgets_list_view"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

            android:clipToPadding="false" />



    </com.android.launcher3.views.TopRoundedCornerView>

</com.android.launcher3.widget.picker.WidgetsFullSheet>
 
 No newline at end of file

res/layout/widgets_full_sheet_search_and_recommendations.xml

+1 −12
Original line number Diff line number Diff line
@@ -34,16 +34,5 @@ 
        android:textSize="24sp"

        android:layout_marginTop="16dp"

        android:text="@string/widget_button_text"/>

    <!-- Disable the search bar because it has not been implemented. -->

    <EditText

        android:id="@+id/widgets_search_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone"

        android:layout_marginTop="16dp"

        android:background="@drawable/bg_widgets_searchbox"

        android:drawablePadding="8dp"

        android:drawableStart="@drawable/ic_allapps_search"

        android:hint="@string/widgets_full_sheet_search_bar_hint"

        android:padding="12dp" />

    <include layout="@layout/widgets_search_bar"/>

</LinearLayout>

res/layout/widgets_list_row_header.xml

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
            android:id="@+id/app_subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:maxLines="1"

            tools:text="m widgets, n shortcuts" />



    </LinearLayout>

res/layout/widgets_search_bar.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<com.android.launcher3.widget.picker.search.WidgetsSearchBar

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/widgets_search_bar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:layout_marginTop="16dp"

    android:background="@drawable/bg_widgets_searchbox"

    android:padding="12dp"

    android:visibility="gone">



    <EditText

        android:id="@+id/widgets_search_bar_edit_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:drawablePadding="8dp"

        android:drawableStart="@drawable/ic_allapps_search"

        android:background="@null"

        android:hint="@string/widgets_full_sheet_search_bar_hint"

        android:maxLines="1"

        android:layout_weight="1"

        android:inputType="text"/>



    <ImageButton

        android:id="@+id/widgets_search_cancel_button"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:src="@drawable/ic_gm_close_24"

        android:background="?android:selectableItemBackground"

        android:layout_gravity="center"

        android:visibility="gone"/>

</com.android.launcher3.widget.picker.search.WidgetsSearchBar>
 
 No newline at end of file