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

Commit e3e24f3a authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Show account filters in navigation drawer"

parents 7a10f1e5 9cfe1afe

res/drawable/side_nav_bar.xml

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

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

       android:shape="rectangle">

    <gradient

        android:angle="135"

        android:endColor="@color/primary_color_dark"

        android:startColor="@color/primary_color"

        android:type="linear"/>

</shape>
 
 No newline at end of file

res/layout/nav_header_main.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/nav_header_height"

    android:background="@drawable/side_nav_bar"

    android:background="@color/contacts_accent_color"

    android:gravity="bottom"

    android:orientation="vertical"

    android:paddingBottom="@dimen/nav_activity_vertical_margin"

res/menu/activity_main_drawer.xml

+30 −6
Original line number Diff line number Diff line
@@ -20,13 +20,9 @@ 


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

        <item

            android:id="@+id/nav_contacts_filter"

            android:id="@+id/nav_all_contacts"

            android:icon="@drawable/ic_menu_filter"

            android:title="@string/menu_contacts_filter" />

        <item

            android:id="@+id/nav_import_export"

            android:icon="@drawable/ic_menu_import_export"

            android:title="@string/menu_import_export"/>

            android:title="@string/contactsList" />

        <item

            android:id="@+id/nav_blocked_numbers"

            android:icon="@drawable/ic_menu_blocked_numbers"
@@ -37,11 +33,39 @@ 
            android:title="@string/menu_duplicates"/>

    </group>



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

        <item

            android:id="@+id/nav_groups"

            android:title="@string/menu_title_groups">

            <menu/>

        </item>

    </group>



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

        <item

            android:id="@+id/nav_create_groups"

            android:icon="@drawable/ic_menu_group_add"

            android:title="@string/menu_new_group_action_bar"

            android:visible="false"/>

    </group>



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

        <item

            android:id="@+id/nav_filters"

            android:title="@string/menu_title_filters">

            <menu/>

        </item>

    </group>



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

        <item

            android:id="@+id/nav_settings"

            android:icon="@drawable/ic_menu_settings"

            android:title="@string/menu_settings"/>

        <item

            android:id="@+id/nav_import_export"

            android:icon="@drawable/ic_menu_import_export"

            android:title="@string/menu_import_export"/>

        <item

            android:id="@+id/nav_help"

            android:icon="@drawable/ic_menu_help"

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ 
    <!-- Top margin for "Saving to" account header text field. -->

    <dimen name="compact_editor_account_header_top_margin">3dp</dimen>



    <!-- Navigation drawer header height, per the Android Design guidelines. -->

    <dimen name="nav_header_height">160dp</dimen>

    <!-- Navigation drawer header height, the same as the status bar in landscape and portrait modes -->

    <dimen name="nav_header_height">24dp</dimen>



    <!-- Navigation drawer margins, per the Android Design guidelines. -->

    <dimen name="nav_activity_horizontal_margin">16dp</dimen>

res/values/ids.xml

+3 −3
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 
    <item type="id" name="nav_misc" />



    <!-- Menu group ID for the contact groups -->

    <item type="id" name="nav_groups" />

    <item type="id" name="nav_groups_items" />



    <!-- Menu group ID for "create new group" -->

    <item type="id" name="nav_create_groups" />

    <!-- Menu group ID for the contact filters -->

    <item type="id" name="nav_filters_items" />

</resources>