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

Revert "Revert "Use system-api lib to get badged, shadowed icons(2/n)""

Browse Source 
This reverts commit 94b8055f1c.

Reason for revert: Revert this cl and fix broken test cases.

Change-Id: I61a190b4beba8db2fe2faab45e5dd6921dc681ec
Fix: 149112222
Fix: 149090275
Test: Run all Setting robo tests
This commit is contained in:
Tsung-Mao Fang
2020-02-10 05:45:33 +00:00
parent 1ab6dd7a71
commit b4fc67ea24
8 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import android.app.ActionBar;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.ColorDrawable;
@@ -38,7 +37,6 @@ import android.os.UserHandle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.fragment.app.Fragment;
@@ -46,7 +44,6 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
@@ -257,20 +254,6 @@ public class EntityHeaderControllerTest {
.isEqualTo(description);
}
@Test
public void setIcon_usingAppEntry_shouldLoadIconFromDrawableFactory() {
final View view = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
entry.info = new ApplicationInfo();
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
mController.setIcon(entry).done(mActivity);
final ImageView iconView = view.findViewById(R.id.entity_header_icon);
// ... entry.icon is still empty. This means the icon didn't come from cache.
assertThat(entry.icon).isNull();
}
@Test
public void bindButton_hasAppNotifIntent_shouldShowButton() {
final View appLinks = mLayoutInflater