From 06304504cdd02f304c293a098aace7f93c5dcf49 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 13 Apr 2017 08:33:32 -0700 Subject: [PATCH] Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual Change-Id: Ie3a10c94e79cd11eefafef25ac4ecd244cf67ea9 --- .../applications/AppHeaderController.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java index 9e416796712..f3a086b2789 100644 --- a/src/com/android/settings/applications/AppHeaderController.java +++ b/src/com/android/settings/applications/AppHeaderController.java @@ -63,17 +63,6 @@ public class AppHeaderController { } 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 final Context mContext; @@ -228,13 +217,6 @@ public class AppHeaderController { ImageView iconView = (ImageView) mAppHeader.findViewById(R.id.app_detail_icon); if (iconView != null) { 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); if (badgeView != null) { badgeView.setVisibility(mIsInstantApp ? View.VISIBLE : View.GONE); @@ -352,4 +334,4 @@ public class AppHeaderController { textView.setVisibility(TextUtils.isEmpty(text) ? View.GONE : View.VISIBLE); } } -} \ No newline at end of file +}