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

Merge "Settings icon pack refresh"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-25 00:29:23 +00:00
committed by Android (Google) Code Review
parent 25249e4314 1f0879955c
commit 468b00f043
23 changed files with 99 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -125,7 +125,7 @@ public class EntityHeaderControllerTest {
mController.setLabel(testString);
mController.setSummary(testString);
mController.setSecondSummary(testString);
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp));
mController.done(mActivity);
assertThat(label).isNotNull();
@@ -238,7 +238,7 @@ public class EntityHeaderControllerTest {
when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp));
mController.setIconContentDescription(description);
mController.done(mActivity);
assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())