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

Merge "Update text for User & accounts page."

Browse Source
This commit is contained in:
Doris Ling
2017-02-08 18:12:01 +00:00
committed by Android (Google) Code Review
parent 17f16f6b98 829d3aaa7a
commit bbd80517f0
5 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,7 +295,8 @@ public class AccountPreferenceController extends PreferenceController
mHelper.createAccessiblePreferenceCategory(mParent.getPreferenceManager().getContext());
preferenceGroup.setOrder(mAccountProfileOrder++);
if (isSingleProfile()) {
preferenceGroup.setTitle(R.string.account_for_section_header);
preferenceGroup.setTitle(context.getString(R.string.account_for_section_header,
userInfo.name));
preferenceGroup.setContentDescription(
mContext.getString(R.string.account_settings));
} else if (userInfo.isManagedProfile()) {

10
src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
View File

@@ -18,10 +18,14 @@ package com.android.settings.accounts;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.search.SearchIndexableRaw;
@@ -48,6 +52,12 @@ public class EmergencyInfoPreferenceController extends PreferenceController {
}
}
public void updateState(Preference preference) {
UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
UserHandle.myUserId());
preference.setSummary(mContext.getString(R.string.emergency_info_summary, info.name));
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_EMERGENCY_INFO.equals(preference.getKey())) {