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

Using icon resource instead of icon bitmap in task description

Browse Source 
Bug: 110739775
Test: Verfied that the icon is displayed correctly if icon-shape override is applied in laucher
Change-Id: Ice7e15a982479960b2644defa33dbdb036c6bd42
This commit is contained in:
Sunny Goyal
2018-07-03 11:39:00 -07:00
parent 6acf0510fb
commit 3c84675db7
2 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/SettingsActivityTest.java
View File

@@ -16,8 +16,7 @@
package com.android.settings;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -28,7 +27,6 @@ import android.app.ActivityManager;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent;
import android.graphics.Bitmap;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -46,8 +44,6 @@ public class SettingsActivityTest {
private FragmentManager mFragmentManager;
@Mock
private ActivityManager.TaskDescription mTaskDescription;
@Mock
private Bitmap mBitmap;
private SettingsActivity mActivity;
@Before
@@ -55,7 +51,6 @@ public class SettingsActivityTest {
MockitoAnnotations.initMocks(this);
mActivity = spy(new SettingsActivity());
doReturn(mBitmap).when(mActivity).getBitmapFromXmlResource(anyInt());
}
@Test
@@ -72,6 +67,6 @@ public class SettingsActivityTest {
public void testSetTaskDescription_IconChanged() {
mActivity.setTaskDescription(mTaskDescription);
verify(mTaskDescription).setIcon(nullable(Bitmap.class));
verify(mTaskDescription).setIcon(anyInt());
}
}