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

Commit 9d032bd9 authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Add full bar mode for search view on small devices" into nyc-dev

parents bed38b9f b0998563

packages/DocumentsUI/res/menu/activity.xml

+59 −56
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
        android:actionViewClass="android.widget.SearchView"

        android:imeOptions="actionSearch"

        android:visible="false" />

<!-- This group is being hidden when searching is in full bar mode-->

    <group android:id="@+id/group_hide_when_searching">

        <item

            android:id="@+id/menu_grid"

            android:title="@string/menu_grid"
@@ -88,4 +90,5 @@ 
            android:title="@string/menu_settings"

            android:showAsAction="never"

            android:visible="false" />

    </group>

</menu>

packages/DocumentsUI/res/values-sw720dp/colors.xml

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

<!-- Copyright (C) 2016 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.

-->



<resources>

    <color name="menu_search_background">#ff676f74</color>

</resources>

packages/DocumentsUI/res/values-sw720dp/config.xml

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

<!-- Copyright (C) 2016 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.

-->



<resources>

    <!-- Indicates if search view is taking the whole toolbar space -->

    <bool name="full_bar_search_view">false</bool>

</resources>

packages/DocumentsUI/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <color name="window_background">#fff1f1f1</color>

    <color name="drawer_background">#fff1f1f1</color>

    <color name="directory_background">#fff7f7f7</color>

    <color name="menu_search_background">#ff676f74</color>

    <color name="menu_search_background">@android:color/transparent</color>



    <color name="primary_dark">@*android:color/primary_dark_material_dark</color>

    <color name="primary">@*android:color/material_blue_grey_900</color>

packages/DocumentsUI/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,4 +26,6 @@ 
    <bool name="home_root_hidden">true</bool>

    <!-- Indicates if the advanced roots like internal storage should be hidden in the roots list) -->

    <bool name="advanced_roots_hidden">true</bool>

    <!-- Indicates if search view is taking the whole toolbar space -->

    <bool name="full_bar_search_view">true</bool>

</resources>