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

Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev

Browse Source
This commit is contained in:
Hyunyoung Song
2017-04-13 18:11:50 +00:00
committed by Android (Google) Code Review
parent d29cb7e7ea 06304504cd
commit 8399697520
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/applications/AppHeaderController.java
View File

@@ -63,17 +63,6 @@ public class AppHeaderController {
} }
public static final String PREF_KEY_APP_HEADER = "pref_app_header"; public static final String PREF_KEY_APP_HEADER = "pref_app_header";
public static final ViewOutlineProvider OUTLINE_PROVIDER = new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
Drawable background = ((ImageView)view).getDrawable();
if (background != null) {
background.getOutline(outline);
}
}
};
private static final String TAG = "AppDetailFeature"; private static final String TAG = "AppDetailFeature";
private final Context mContext; private final Context mContext;
@@ -228,13 +217,6 @@ public class AppHeaderController {
ImageView iconView = (ImageView) mAppHeader.findViewById(R.id.app_detail_icon); ImageView iconView = (ImageView) mAppHeader.findViewById(R.id.app_detail_icon);
if (iconView != null) { if (iconView != null) {
iconView.setImageDrawable(mIcon); iconView.setImageDrawable(mIcon);
if (mIcon instanceof AdaptiveIconDrawable) {
iconView.setElevation(mIconElevation);
iconView.setOutlineProvider(OUTLINE_PROVIDER);
} else {
iconView.setElevation(0);
iconView.setOutlineProvider(null);
}
ImageView badgeView = mAppHeader.findViewById(R.id.app_icon_instant_apps_badge); ImageView badgeView = mAppHeader.findViewById(R.id.app_icon_instant_apps_badge);
if (badgeView != null) { if (badgeView != null) {
badgeView.setVisibility(mIsInstantApp ? View.VISIBLE : View.GONE); badgeView.setVisibility(mIsInstantApp ? View.VISIBLE : View.GONE);