Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f07554fd authored by Winson Chung's avatar Winson Chung
Browse files

Updating call to set icon on task description 

Bug: 143363444
Test: Manual
Change-Id: If4c20dea99cce6c365f509885beb7b561b70495b
parent 6980bebe

src/com/android/settings/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.ActivityInfo; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources.Theme;

import android.graphics.drawable.Icon;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.UserHandle;
@@ -491,7 +492,7 @@ public class SettingsActivity extends SettingsBaseActivity 


    @Override

    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);

    }

tests/robotests/src/com/android/settings/SettingsActivityTest.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; 


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.mock;

import static org.mockito.Mockito.spy;
@@ -82,7 +82,7 @@ public class SettingsActivityTest { 
    public void setTaskDescription_shouldUpdateIcon() {

        mActivity.setTaskDescription(mTaskDescription);



        verify(mTaskDescription).setIcon(anyInt());

        verify(mTaskDescription).setIcon(any());

    }



    @Test