From b2e357c788c163599e664d73e6d404b57ce3a35b Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 22 Jan 2016 15:28:16 -0500 Subject: [PATCH] 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 --- res/layout/app_header.xml | 3 ++- src/com/android/settings/AppHeader.java | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/res/layout/app_header.xml b/res/layout/app_header.xml index 6c13ae886ea..2d8a099be75 100644 --- a/res/layout/app_header.xml +++ b/res/layout/app_header.xml @@ -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" /> diff --git a/src/com/android/settings/AppHeader.java b/src/com/android/settings/AppHeader.java index 36026bb53a1..0351ed5072d 100644 --- a/src/com/android/settings/AppHeader.java +++ b/src/com/android/settings/AppHeader.java @@ -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) { - AppInfoBase.startAppInfoFragment(InstalledAppDetails.class, - R.string.application_info_label, pkgName, uid, activity, - INSTALLED_APP_DETAILS); + 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; }