Show account filters in navigation drawer
- Remove the blue rectangle and use a white background of height 24dp.
- Navigation drawer design: https://docs.google.com/a/google.com/document/d/1oVptSYWa84CGt2mIQxmRObLVqopJUUilZxlARCJaiMs/edit?usp=sharing
- The external text "labels" corresponds to "groups" in code; the text
"Accounts" corresponds to "filters" in code.
- Avoid opening AccountFilterActivity from filter header.
Bug 27687799
Bug 28245667
Fixes 28245762
Fixes 28245372
Change-Id: I75efa2fca05a1c5b74051f43e342a61f937602a1
diff --git a/res/drawable/side_nav_bar.xml b/res/drawable/side_nav_bar.xml
deleted file mode 100644
index b67bfb5..0000000
--- a/res/drawable/side_nav_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
diff --git a/res/layout/nav_header_main.xml b/res/layout/nav_header_main.xml
index cd6d559..37a33f4 100644
--- a/res/layout/nav_header_main.xml
+++ b/res/layout/nav_header_main.xml
@@ -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"
diff --git a/res/menu/activity_main_drawer.xml b/res/menu/activity_main_drawer.xml
index 2a69763..75277af 100644
--- a/res/menu/activity_main_drawer.xml
+++ b/res/menu/activity_main_drawer.xml
@@ -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,12 +33,40 @@
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"
android:title="@string/menu_help"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c429ec9..f60670c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -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>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index b0470b5..f5649d9 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e1b857..829671f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -928,4 +928,10 @@
<!-- Close drawer content descriptions [CHAR LIMIT=40] -->
<string name="navigation_drawer_close">Close navigation drawer</string>
+
+ <!-- Menu section title of "labels" [CHAR LIMIT=20] -->
+ <string name="menu_title_groups">Labels</string>
+
+ <!-- Menu section title of "accounts" [CHAR LIMIT=20] -->
+ <string name="menu_title_filters">Accounts</string>
</resources>