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

Commit 76060eb1 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Bug fixes for widget picker search (2/n) 

- Dismiss keyboard when user starts to drag widget picker
- Add content description for cancel button

Test: Tested manually.
Bug: 183211445
Bug: 183106676
Change-Id: Ie620c3d50a49d8380f316d48e4ee8ebced6de5eb
parent b4002575

res/layout/widgets_search_bar.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ 
        android:src="@drawable/ic_gm_close_24"

        android:background="?android:selectableItemBackground"

        android:layout_gravity="center"

        android:contentDescription="@string/widgets_full_sheet_cancel_button_description"

        android:visibility="gone"/>

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

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ 
    <!-- Search bar text shown in the popup view showing all available widgets installed on the

         device. [CHAR_LIMIT=50] -->

    <string name="widgets_full_sheet_search_bar_hint">Search</string>

    <!-- Spoken text for screen readers. This text lets a user know that the button is used to clear

         the text that the user entered in the search box. [CHAR_LIMIT=none] -->

    <string name="widgets_full_sheet_cancel_button_description">Clear text from search box</string>

    <!-- Text shown when there is no widgets shown in the popup view showing all available widgets

         installed on the device. [CHAR_LIMIT=none] -->

    <string name="no_widgets_available">No widgets available</string>

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.view.LayoutInflater; 
import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import android.widget.TextView;
@@ -554,6 +555,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
        return super.onBackPressed();

    }



    @Override

    public void onDragStart(boolean start, float startDisplacement) {

        super.onDragStart(start, startDisplacement);

        getWindowInsetsController().hide(WindowInsets.Type.ime());

    }



    /** A holder class for holding adapters & their corresponding recycler view. */

    private final class AdapterHolder {

        static final int PRIMARY = 0;