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

Commit 235134a4 authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

Merge "Allow non-primary users to configure calling accounts" into ub-contactsdialer-b-dev

parents 42bab804 95d594a2

src/com/android/dialer/settings/DialerSettingsActivity.java

+24 −22
Original line number Diff line number Diff line
@@ -71,10 +71,12 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { 
        TelephonyManager telephonyManager =

                (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);



        // Only show call setting menus if the current user is the primary/owner user.

        if (isPrimaryUser()) {

            // Show "Call Settings" if there is one SIM and "Phone Accounts" if there are more.

            if (telephonyManager.getPhoneCount() <= 1) {

        // "Call Settings" (full settings) is shown if the current user is primary user and there 

        // is only one SIM. Before N, "Calling accounts" setting is shown if the current user is 

        // primary user and there are multiple SIMs. In N+, "Calling accounts" is shown whenever

        // "Call Settings" is not shown.

        boolean isPrimaryUser = isPrimaryUser();

        if (isPrimaryUser && telephonyManager.getPhoneCount() <= 1) {

            Header callSettingsHeader = new Header();

            Intent callSettingsIntent = new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS);

            callSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -82,7 +84,7 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { 
            callSettingsHeader.titleRes = R.string.call_settings_label;

            callSettingsHeader.intent = callSettingsIntent;

            target.add(callSettingsHeader);

            } else {

        } else if (android.os.Build.VERSION.CODENAME.startsWith("N") || isPrimaryUser) {

            Header phoneAccountSettingsHeader = new Header();

            Intent phoneAccountSettingsIntent =

                    new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
@@ -92,7 +94,7 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { 
            phoneAccountSettingsHeader.intent = phoneAccountSettingsIntent;

            target.add(phoneAccountSettingsHeader);

        }



        if (isPrimaryUser) {

            Header blockedCallsHeader = new Header();

            blockedCallsHeader.titleRes = R.string.manage_blocked_numbers_label;

            blockedCallsHeader.intent = new Intent(this, BlockedNumbersSettingsActivity.class);