Update top level menu items summary text.

- Use static summary for most items
- Move summary for user setting to user&account setting

Bug: 34975053
Test: RunSettingsRoboTests
Change-Id: I9bf87267778dc5933f97f5d3b9ae0f4f0b8da1a8
This commit is contained in:
Fan Zhang
2017-02-09 13:06:58 -08:00
parent 3fca717d3b
commit 7520e81ab5
11 changed files with 157 additions and 398 deletions

View File

@@ -15,11 +15,16 @@
*/
package com.android.settings.accounts;
import android.app.Activity;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.Tile;
@@ -37,6 +42,9 @@ import org.robolectric.shadows.ShadowApplication;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(RobolectricTestRunner.class)
@@ -48,6 +56,8 @@ public class UserAndAccountDashboardFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private UserManager mUserManager;
private UserAndAccountDashboardFragment mFragment;
@Before
@@ -86,6 +96,24 @@ public class UserAndAccountDashboardFragmentTest {
assertThat(mFragment.displayTile(tile)).isTrue();
}
@Test
public void updateSummary_shouldDisplaySignedInUser() {
final Activity activity = mock(Activity.class);
final SummaryLoader loader = mock(SummaryLoader.class);
final UserInfo userInfo = new UserInfo();
userInfo.name = "test_name";
when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
.createSummaryProvider(activity, loader);
provider.setListening(true);
verify(activity).getString(R.string.user_summary,
userInfo.name);
}
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =