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

Commit 8ea2dea9 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Dang Duy Son
Browse files

resolve merge conflicts of 3964c51b to nyc-dev 

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit 0f04a5a9)
parent 3a7f69f5

src/com/android/settings/accounts/ManageAccountsSettings.java

+7 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.drawable.Drawable; 
import android.os.Bundle;

import android.preference.Preference;

import android.preference.PreferenceActivity;

import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.util.Log;

import android.view.LayoutInflater;
@@ -382,15 +383,18 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
    }



    /**

     * Filters through the preference list provided by GoogleLoginService.

     * Recursively filters through the preference list provided by GoogleLoginService.

     *

     * This method removes all the invalid intent from the list, adds account name as extra into the

     * intent, and hack the location settings to start it as a fragment.

     */

    private void updatePreferenceIntents(PreferenceScreen prefs) {

    private void updatePreferenceIntents(PreferenceGroup prefs) {

        PackageManager pm = getActivity().getPackageManager();

        for (int i = 0; i < prefs.getPreferenceCount();) {

            Preference pref = prefs.getPreference(i);

            if (pref instanceof PreferenceGroup) {

                updatePreferenceIntents((PreferenceGroup) pref);

            }

            Intent intent = pref.getIntent();

            if (intent != null) {

                // Hack. Launch "Location" as fragment instead of as activity.