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

Commit b2e357c7 authored by Jason Monk's avatar Jason Monk
Browse files

Remove info icon from app header 

Instead make the app header clickable, launch if coming from app list
and finish if coming from app info.

Bug: 26288458
Change-Id: I7f10a2385356107812dedc8de5d5761b1200e320
parent 7eda1c5f

res/layout/app_header.xml

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 
        android:minWidth="0dp"

        android:contentDescription="@string/notification_app_settings_button"

        android:scaleType="center"

        android:src="@drawable/ic_info"

        android:src="@drawable/ic_settings_24dp"

        android:visibility="gone"

        style="?android:attr/borderlessButtonStyle" />



</RelativeLayout>

src/com/android/settings/AppHeader.java

+11 −10
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class AppHeader { 
    }



    public static View setupHeaderView(final Activity activity, Drawable icon, CharSequence label,

            final String pkgName, final int uid, boolean includeAppInfo, int tintColorRes,

            final String pkgName, final int uid, final boolean includeAppInfo, int tintColorRes,

            View bar) {

        final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);

        appIcon.setImageDrawable(icon);
@@ -69,19 +69,20 @@ public class AppHeader { 
        final TextView appName = (TextView) bar.findViewById(R.id.app_name);

        appName.setText(label);



        final View appSettings = bar.findViewById(R.id.app_settings);

        if (includeAppInfo && pkgName != null && !pkgName.equals(Utils.OS_PKG)) {

            appSettings.setClickable(true);

            appSettings.setOnClickListener(new OnClickListener() {

        if (pkgName != null && !pkgName.equals(Utils.OS_PKG)) {

            bar.setClickable(true);

            bar.setOnClickListener(new OnClickListener() {

                @Override

                public void onClick(View v) {

                    if (includeAppInfo) {

                        AppInfoBase.startAppInfoFragment(InstalledAppDetails.class,

                                R.string.application_info_label, pkgName, uid, activity,

                                INSTALLED_APP_DETAILS);

                    } else {

                        activity.finish();

                    }

                }

            });

        } else {

            appSettings.setVisibility(View.GONE);

        }

        return bar;

    }