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

Merge "Updating call to set icon on task description"

Browse Source
This commit is contained in:
Winson Chung
2020-02-21 22:59:45 +00:00
committed by Android (Google) Code Review
parent 4e2ba8f7b3 f07554fdb3
commit 34fdec2668
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsActivity.java
View File

@@ -30,6 +30,7 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources.Theme; import android.content.res.Resources.Theme;
import android.graphics.drawable.Icon;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
@@ -491,7 +492,7 @@ public class SettingsActivity extends SettingsBaseActivity
@Override @Override
public void setTaskDescription(ActivityManager.TaskDescription taskDescription) { public void setTaskDescription(ActivityManager.TaskDescription taskDescription) {
taskDescription.setIcon(R.drawable.ic_launcher_settings); taskDescription.setIcon(Icon.createWithResource(this, R.drawable.ic_launcher_settings));
super.setTaskDescription(taskDescription); super.setTaskDescription(taskDescription);
} }

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

@@ -20,7 +20,7 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -82,7 +82,7 @@ public class SettingsActivityTest {
public void setTaskDescription_shouldUpdateIcon() { public void setTaskDescription_shouldUpdateIcon() {
mActivity.setTaskDescription(mTaskDescription); mActivity.setTaskDescription(mTaskDescription);
verify(mTaskDescription).setIcon(anyInt()); verify(mTaskDescription).setIcon(any());
} }
@Test @Test