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

Commit 83996975 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516... 

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

src/com/android/settings/applications/AppHeaderController.java

+1 −19
Original line number Diff line number Diff line
@@ -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);