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

Commit 2a022baa authored by Tony Huang's avatar Tony Huang
Browse files

Implement search history UI 

Implement search history base on history db and history manager.

Bug: 111863038
Test: manual
Test: atest DocumentsUITests
Change-Id: I5a839969a3d603deba6fcf3d6945a6a349320385
parent fe43b0d1

res/drawable/ic_arrow_back.xml

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

<!--

  Copyright 2019, The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



      http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?android:textColorPrimary"

        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_history.xml

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

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<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:textColorSecondary"

        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l4,3.99L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z"/>

</vector>
 
 No newline at end of file

res/layout/fragment_search.xml

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

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    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">



        <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"/>



    <ListView

        android:id="@+id/history_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:divider="@null"/>



</LinearLayout>
 
 No newline at end of file

res/layout/item_history.xml

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

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:gravity="center_vertical">



    <ImageView

        android:layout_width="@dimen/icon_size"

        android:layout_height="@dimen/icon_size"

        android:src="@drawable/ic_history"

        android:scaleType="centerInside"/>



    <TextView

        android:id="@android:id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:textAppearance="?android:attr/textAppearanceListItemSmall"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center_vertical"/>



    <ImageView

        android:id="@android:id/icon"

        android:layout_width="@dimen/icon_size"

        android:layout_height="@dimen/icon_size"

        android:background="@drawable/generic_ripple_background"

        android:src="@drawable/ic_action_clear"

        android:scaleType="centerInside"/>



</LinearLayout>
 
 No newline at end of file

src/com/android/documentsui/BaseActivity.java

+21 −6
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.documentsui.prefs.PreferencesMonitor; 
import com.android.documentsui.prefs.ScopedPreferences;

import com.android.documentsui.queries.CommandInterceptor;

import com.android.documentsui.queries.SearchChipData;

import com.android.documentsui.queries.SearchFragment;

import com.android.documentsui.queries.SearchViewManager;

import com.android.documentsui.queries.SearchViewManager.SearchManagerListener;

import com.android.documentsui.roots.ProvidersCache;
@@ -74,7 +75,6 @@ import com.android.documentsui.sorting.SortController; 
import com.android.documentsui.sorting.SortModel;



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

import com.google.android.material.chip.Chip;



import java.util.ArrayList;

import java.util.Date;
@@ -204,6 +204,18 @@ public abstract class BaseActivity 
                    Metrics.logSearchType(item.getChipType());

                }

            }



            @Override

            public void onSearchViewFocusChanged(boolean hasFocus) {

                final boolean isInitailSearch

                        = !TextUtils.isEmpty(mSearchManager.getCurrentSearch())

                        && TextUtils.isEmpty(mSearchManager.getSearchViewText());

                if (hasFocus && (SearchFragment.get(getSupportFragmentManager()) == null)

                        && !isInitailSearch) {

                    SearchFragment.showFragment(getSupportFragmentManager(),

                            mSearchManager.getSearchViewText());

                }

            }

        };



        // "Commands" are meta input for controlling system behavior.
@@ -383,11 +395,7 @@ public abstract class BaseActivity 
                    doc -> mInjector.actions.openRootDocument(doc));

        }



        final AppBarLayout appBarLayout = findViewById(R.id.app_bar);

        if (appBarLayout != null) {

            appBarLayout.setExpanded(true);

        }



        expandAppBar();

        updateHeaderTitle();

    }
@@ -595,6 +603,13 @@ public abstract class BaseActivity 
        // TODO: Isolate this behavior to PickActivity.

    }



    public void expandAppBar() {

        final AppBarLayout appBarLayout = findViewById(R.id.app_bar);

        if (appBarLayout != null) {

            appBarLayout.setExpanded(true);

        }

    }



    public void updateHeaderTitle() {

        if (!mState.stack.isInitialized()) {

            //stack has not initialized, the header will update after the stack finishes loading