diff options
| author | 2020-04-17 21:54:13 +0000 | |
|---|---|---|
| committer | 2020-04-17 21:54:13 +0000 | |
| commit | 8bc6cadf7053517de534e171c3a69c92424c1150 (patch) | |
| tree | 6c47eca749f2075756c639924efff12414a464c7 /res/layout | |
| parent | c68c9a1feaf8abcb7fe0d45d5a30661667626dc9 (diff) | |
| parent | af64d6af97ab2be252c32708fe2ca8c2a7d13543 (diff) | |
Merge "Refactor SearchFragment to fix keyboard focus issue." into rvc-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/directory_header.xml | 1 | ||||
| -rw-r--r-- | res/layout/drawer_layout.xml | 6 | ||||
| -rw-r--r-- | res/layout/fixed_layout.xml | 18 | ||||
| -rw-r--r-- | res/layout/fragment_search.xml | 15 |
4 files changed, 22 insertions, 18 deletions
diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml index 4c4d84573..94c52e978 100644 --- a/res/layout/directory_header.xml +++ b/res/layout/directory_header.xml @@ -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" diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml index a5331d520..0b2a81d72 100644 --- a/res/layout/drawer_layout.xml +++ b/res/layout/drawer_layout.xml @@ -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 diff --git a/res/layout/fixed_layout.xml b/res/layout/fixed_layout.xml index 10a569d54..fb2cb2452 100644 --- a/res/layout/fixed_layout.xml +++ b/res/layout/fixed_layout.xml @@ -77,11 +77,23 @@ <include layout="@layout/directory_header" /> <FrameLayout - android:id="@+id/container_directory" - android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1" /> + android:layout_weight="1"> + + <FrameLayout + android:id="@+id/container_directory" + android:clipToPadding="false" + android:layout_width="match_parent" + 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" diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml index ca6895fe5..02baffdd3 100644 --- a/res/layout/fragment_search.xml +++ b/res/layout/fragment_search.xml @@ -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"/> |