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

Commit 6140eefe authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Merge "Refactor SearchFragment to fix keyboard focus issue." into rvc-dev am:... 

Merge "Refactor SearchFragment to fix keyboard focus issue." into rvc-dev am: 8bc6cadf am: 9237f3ad am: 446d6eb1

Change-Id: Ib34c758ad30edb8d4515acc2294836e5d9cee893
parents 7307fe95 446d6eb1

res/layout/directory_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

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

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

    android:id="@+id/directory_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/action_bar_space_margin"

res/layout/drawer_layout.xml

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ 


                </LinearLayout>



                <FrameLayout

                    android:id="@+id/container_search_fragment"

                    android:clipToPadding="false"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent" />



                <!-- Drawer edge is a dummy view used to capture hovering event

                     on view edge to open the drawer. (b/28345294) -->

                <View

res/layout/fixed_layout.xml

+15 −3
Original line number Diff line number Diff line
@@ -76,12 +76,24 @@ 


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



                <FrameLayout

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1">



                    <FrameLayout

                        android:id="@+id/container_directory"

                        android:clipToPadding="false"

                        android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1" />

                        android:layout_height="match_parent" />



                    <FrameLayout

                        android:id="@+id/container_search_fragment"

                        android:clipToPadding="false"

                        android:layout_width="match_parent"

                        android:layout_height="match_parent" />



                </FrameLayout>



                <androidx.coordinatorlayout.widget.CoordinatorLayout

                    android:id="@+id/container_save"

res/layout/fragment_search.xml

+0 −15
Original line number Diff line number Diff line
@@ -22,21 +22,6 @@ 
    android:layout_height="match_parent"

    android:background="?android:attr/colorBackground">



    <androidx.appcompat.widget.Toolbar

        android:id="@+id/toolbar"

        android:layout_width="match_parent"

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

        android:layout_margin="@dimen/search_bar_margin"

        android:theme="?actionBarTheme"

        app:navigationIcon="@drawable/ic_arrow_back"

        app:navigationContentDescription="@string/button_back">



        <androidx.appcompat.widget.SearchView

            android:id="@+id/search_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

    </androidx.appcompat.widget.Toolbar>



    <!-- used for search chip. -->

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

src/com/android/documentsui/BaseActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ public abstract class BaseActivity 
             */

            @Override

            public void onSearchChanged(@Nullable String query) {

                if (query != null) {

                    SearchFragment.dismissFragment(getSupportFragmentManager());

                }



                if (mSearchManager.isSearching()) {

                    Metrics.logSearchMode(query != null, mSearchManager.hasCheckedChip());

                    if (mInjector.pickResult != null) {
@@ -226,6 +230,8 @@ public abstract class BaseActivity 
                        && !isInitailSearch) {

                    SearchFragment.showFragment(getSupportFragmentManager(),

                            mSearchManager.getSearchViewText());

                } else {

                    SearchFragment.dismissFragment(getSupportFragmentManager());

                }

            }