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

Commit 4a8acacd authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Bidi wrap owner name in account setting page." into pi-dev 

am: 8a3bcaa3

Change-Id: I76c750048387a0886a5dbf4cd3de3fde5ccc56d0
parents 6bc28cdb 8a3bcaa3

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

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.support.v7.preference.Preference; 
import android.support.v7.preference.Preference.OnPreferenceClickListener;

import android.support.v7.preference.PreferenceGroup;

import android.support.v7.preference.PreferenceScreen;

import android.text.BidiFormatter;

import android.util.ArrayMap;

import android.util.Log;

import android.util.SparseArray;
@@ -313,7 +314,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
        preferenceGroup.setOrder(mAccountProfileOrder++);

        if (isSingleProfile()) {

            preferenceGroup.setTitle(context.getString(R.string.account_for_section_header,

                userInfo.name));

                    BidiFormatter.getInstance().unicodeWrap(userInfo.name)));

            preferenceGroup.setContentDescription(

                mContext.getString(R.string.account_settings));

        } else if (userInfo.isManagedProfile()) {