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

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

Merge "Remove "Manage accounts" from PeopleActivity"

parents fdd3e582 318b61d7

res/menu/activity_main_drawer.xml

+0 −4
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 
            android:id="@+id/nav_import_export"

            android:icon="@drawable/ic_menu_import_export"

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

        <item

            android:id="@+id/nav_accounts"

            android:icon="@drawable/ic_account_circle_black_24dp"

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

        <item

            android:id="@+id/nav_blocked_numbers"

            android:icon="@drawable/ic_menu_blocked_numbers"

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

+0 −9
Original line number Diff line number Diff line
@@ -29,11 +29,9 @@ import android.graphics.Rect; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Parcelable;

import android.provider.ContactsContract;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.ProviderStatus;

import android.provider.ContactsContract.QuickContact;

import android.provider.Settings;

import android.support.design.widget.NavigationView;

import android.support.v13.app.FragmentPagerAdapter;

import android.support.v4.view.GravityCompat;
@@ -1209,13 +1207,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
                    mContactListFilterController.getFilter());

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

            showImportExportDialogFragment();

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

            final Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);

            intent.putExtra(Settings.EXTRA_AUTHORITIES, new String[] {

                    ContactsContract.AUTHORITY

            });

            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);

            ImplicitIntentsUtil.startActivityInAppIfPossible(this, intent);

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

            final Intent intent = TelecomManagerUtil.createManageBlockedNumbersIntent(

                    (TelecomManager) getSystemService(Context.TELECOM_SERVICE));