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

Commit 8bad7225 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9853495 from 6932d106 to udc-release 

Change-Id: I2a9ca59ed4b152cc6aaa5ddb9f8f7272a53224a6
parents 8ba3626d 6932d106

src/com/android/documentsui/NavigationViewManager.java

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.documentsui.base.State; 
import com.android.documentsui.base.UserId;

import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.util.VersionUtils;

import com.android.modules.utils.build.SdkLevel;



import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.appbar.CollapsingToolbarLayout;
@@ -159,6 +160,15 @@ public class NavigationViewManager implements AppBarLayout.OnOffsetChangedListen 


    public void setSearchBarClickListener(View.OnClickListener listener) {

        mSearchBarView.setOnClickListener(listener);

        if (SdkLevel.isAtLeastU()) {

            try {

                mSearchBarView.setHandwritingDelegatorCallback(

                        () -> listener.onClick(mSearchBarView));

            } catch (LinkageError e) {

                // Running on a device with an older build of Android U

                // TODO(b/274154553): Remove try/catch block after Android U Beta 1 is released

            }

        }

    }



    public ProfileTabsAddons getProfileTabsAddons() {

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

+12 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.documentsui.base.EventHandler; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.Shared;

import com.android.documentsui.base.State;

import com.android.modules.utils.build.SdkLevel;



import java.util.Timer;

import java.util.TimerTask;
@@ -237,6 +238,17 @@ public class SearchViewManager implements 
                mListener.onSearchViewClearClicked();

            });

        }

        if (SdkLevel.isAtLeastU()) {

            final View textView = mSearchView.findViewById(R.id.search_src_text);

            if (textView != null) {

                try {

                    textView.setIsHandwritingDelegate(true);

                } catch (LinkageError e) {

                    // Running on a device with an older build of Android U

                    // TODO(b/274154553): Remove try/catch block after Android U Beta 1 is released

                }

            }

        }



        mFullBar = isFullBarSearch;

        mShowSearchBar = isShowSearchBar;