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

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

Merge "Remove divider above "Create new...""

parents 1985fb29 672b4620

res/menu/activity_main_drawer.xml

+0 −8
Original line number Diff line number Diff line
@@ -41,14 +41,6 @@ 
        </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"

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -877,8 +877,8 @@ 
    <!-- The menu item to open blocked numbers activity [CHAR LIMIT=60]-->

    <string name="menu_blocked_numbers">Blocked numbers</string>



    <!-- The menu item to open the link/merge duplicates activity. [CHAR LIMIT=80]-->

    <string name="menu_duplicates">Find duplicates</string>

    <!-- The menu item to open the link/merge duplicates activity. [CHAR LIMIT=20]-->

    <string name="menu_duplicates">Duplicates</string>



    <!-- Open drawer content descriptions [CHAR LIMIT=40] -->

    <string name="navigation_drawer_open">Open navigation drawer</string>

src/com/android/contacts/activities/PeopleActivity.java

+5 −3
Original line number Diff line number Diff line
@@ -925,7 +925,11 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
            }

        }



        makeMenuItemVisible(menu, R.id.nav_create_groups, areGroupWritableAccountsAvailable());

        // Create a menu item in the sub menu to add new groups

        final MenuItem menuItem = subMenu.add(R.id.nav_groups_items, Menu.NONE, Menu.NONE,

                getString(R.string.menu_new_group_action_bar));

        menuItem.setIntent(GroupUtil.createAddGroupIntent(this));

        menuItem.setIcon(R.drawable.ic_menu_group_add);

    }



    @Override
@@ -1247,8 +1251,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
        } else if (id == R.id.nav_find_duplicates) {

            ImplicitIntentsUtil.startActivityInAppIfPossible(this,

                    Assistants.getDuplicatesActivityIntent(this));

        } else if (id == R.id.nav_create_groups) {

            ImplicitIntentsUtil.startActivityInApp(this, GroupUtil.createAddGroupIntent(this));

        } else if (item.getIntent() != null) {

            ImplicitIntentsUtil.startActivityInApp(this, item.getIntent());

        } else {