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

Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8

Browse Source 
am: 77fca989a0

Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2
This commit is contained in:
Sunny Goyal
2017-04-19 03:03:50 +00:00
committed by android-build-merger
parent a300f3c53a 77fca989a0
commit 91f6cad742
12 changed files with 37 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/android/util/LauncherIcons.java → tests/robotests/src/android/util/IconDrawableFactory.java
View File

@@ -16,17 +16,29 @@
package android.util;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageItemInfo;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
/**
* This class is only needed to get around RoboElectric issue.
* This class is only needed to get around Robolectric issue.
*/
public final class LauncherIcons {
public class IconDrawableFactory {
public LauncherIcons(Context context) {
public static IconDrawableFactory newInstance(Context context) {
return new IconDrawableFactory();
}
public Drawable wrapIconDrawableWithShadow(Drawable drawable) {
return drawable;
public Drawable getBadgedIcon(ApplicationInfo appInfo) {
return getBadgedIcon(appInfo, 0);
}
public Drawable getBadgedIcon(ApplicationInfo appInfo, int userId) {
return getBadgedIcon(appInfo, appInfo, userId);
}
public Drawable getBadgedIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo, int userId) {
return new ColorDrawable(0);
}
}

15
tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -38,7 +39,6 @@ import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.settings.R;
@@ -276,17 +276,6 @@ public class AppHeaderControllerTest {
.isEqualTo(View.GONE);
}
// Ensure that the instant app label does not show up when we haven't told the controller the
// app is instant.
@Test
public void instantApps_normalAppsDontGetInstantAppsBadge() {
final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, appHeader);
mController.done(mActivity);
assertThat(appHeader.findViewById(R.id.app_icon_instant_apps_badge).getVisibility())
.isEqualTo(View.GONE);
}
// Test that the "instant apps" label is present in the header when we have an instant app.
@Test
public void instantApps_expectedHeaderItem() {
@@ -295,8 +284,6 @@ public class AppHeaderControllerTest {
mController.setIsInstantApp(true);
mController.done(mActivity);
TextView label = appHeader.findViewById(R.id.install_type);
ImageView badgeView = appHeader.findViewById(R.id.app_icon_instant_apps_badge);
assertThat(badgeView.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(label.getText()).isEqualTo(
appHeader.getResources().getString(R.string.install_type_instant));