PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bidi wrap owner name in account setting page." into pi-dev am: 8a3bcaa3e3

Browse Source 
am: 4a8acacde0

Change-Id: Ie26828f23d760af36f922a66c0b7c45f8a7e4945
This commit is contained in:
Fan Zhang
2018-04-18 17:47:11 -07:00
committed by android-build-merger
parent d19398abae 4a8acacde0
commit c83ebf15e5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -40,6 +40,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.text.BidiFormatter;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -313,7 +314,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
preferenceGroup.setOrder(mAccountProfileOrder++); preferenceGroup.setOrder(mAccountProfileOrder++);
if (isSingleProfile()) { if (isSingleProfile()) {
preferenceGroup.setTitle(context.getString(R.string.account_for_section_header, preferenceGroup.setTitle(context.getString(R.string.account_for_section_header,
userInfo.name)); BidiFormatter.getInstance().unicodeWrap(userInfo.name)));
preferenceGroup.setContentDescription( preferenceGroup.setContentDescription(
mContext.getString(R.string.account_settings)); mContext.getString(R.string.account_settings));
} else if (userInfo.isManagedProfile()) { } else if (userInfo.isManagedProfile()) {