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

Commit 2add5b0d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5430508 from 119b68cf to qt-release 

Change-Id: I93d90b37b24630bdec4bfedc54516161fdbc1189
parents 0b4d0f0e 119b68cf

res/layout/fragment_search.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




<LinearLayout

<LinearLayout

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

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

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

    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"
@@ -26,7 +27,9 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:layout_height="?android:attr/actionBarSize"

        android:layout_margin="@dimen/search_bar_margin"

        android:layout_margin="@dimen/search_bar_margin"

        android:theme="?actionBarTheme">

        android:theme="?actionBarTheme"

        app:navigationIcon="@drawable/ic_arrow_back"

        app:navigationContentDescription="@string/abc_toolbar_collapse_description">





        <androidx.appcompat.widget.SearchView

        <androidx.appcompat.widget.SearchView

            android:id="@+id/search_view"

            android:id="@+id/search_view"

src/com/android/documentsui/picker/LastAccessedProvider.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.FileUtils;

import android.os.FileUtils;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;





import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.DocumentStack;
@@ -191,8 +192,10 @@ public class LastAccessedProvider extends ContentProvider { 
            final Set<String> knownAuth = new HashSet<>();

            final Set<String> knownAuth = new HashSet<>();

            for (ResolveInfo info : getContext()

            for (ResolveInfo info : getContext()

                    .getPackageManager().queryIntentContentProviders(intent, 0)) {

                    .getPackageManager().queryIntentContentProviders(intent, 0)) {

                if (info != null && !TextUtils.isEmpty(info.providerInfo.authority)) {

                    knownAuth.add(info.providerInfo.authority);

                    knownAuth.add(info.providerInfo.authority);

                }

                }

            }





            purgeByAuthority(new Predicate<String>() {

            purgeByAuthority(new Predicate<String>() {

                @Override

                @Override

src/com/android/documentsui/queries/SearchFragment.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ public class SearchFragment extends DialogFragment 
        final View view = inflater.inflate(R.layout.fragment_search, container, false);

        final View view = inflater.inflate(R.layout.fragment_search, container, false);





        final Toolbar toolbar = view.findViewById(R.id.toolbar);

        final Toolbar toolbar = view.findViewById(R.id.toolbar);

        toolbar.setNavigationIcon(R.drawable.ic_arrow_back);

        toolbar.setNavigationOnClickListener(v -> {

        toolbar.setNavigationOnClickListener(v -> {

            mSearchViewManager.cancelSearch();

            mSearchViewManager.cancelSearch();

            dismiss();

            dismiss();