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

Update text for User & accounts page.

Browse Source 
- Add the user name to the Account preference group title.
- Add the summary text to Emergency information.

Bug: 34976320
Test: make RunSettingsRoboTests
Change-Id: I771e355ce3b313ffa50feb5c5e7907b1f3857592
This commit is contained in:
Doris Ling
2017-02-03 15:06:56 -08:00
parent ebccf8d093
commit 829d3aaa7a
5 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
View File

@@ -18,11 +18,17 @@ 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.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import java.util.ArrayList;
import java.util.List;
@@ -51,6 +57,8 @@ public class EmergencyInfoPreferenceControllerTest {
private Context mContext;
@Mock(answer = RETURNS_DEEP_STUBS)
private PreferenceScreen mScreen;
@Mock(answer = RETURNS_DEEP_STUBS)
private UserManager mUserManager;
private EmergencyInfoPreferenceController mController;
@@ -111,6 +119,21 @@ public class EmergencyInfoPreferenceControllerTest {
verify(mScreen, never()).removePreference(any(Preference.class));
}
@Test
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
public void updateState_shouldSetSummary() {
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
when((Object) mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
final Preference preference = mock(Preference.class);
mController.updateState(preference);
verify(preference).setSummary(
mContext.getString(R.string.emergency_info_summary, "user 1"));
}
@Test
public void handlePreferenceTreeClick_shouldStartActivity() {
final ShadowApplication application = ShadowApplication.getInstance();