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

Remove info icon from app header

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

Bug: 26288458
Change-Id: I7f10a2385356107812dedc8de5d5761b1200e320
This commit is contained in:
Jason Monk
2016-01-22 15:28:16 -05:00
parent 7eda1c5fa1
commit b2e357c788
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/app_header.xml
View File

@@ -50,7 +50,8 @@
android:minWidth="0dp" android:minWidth="0dp"
android:contentDescription="@string/notification_app_settings_button" android:contentDescription="@string/notification_app_settings_button"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_info" android:src="@drawable/ic_settings_24dp"
android:visibility="gone"
style="?android:attr/borderlessButtonStyle" /> style="?android:attr/borderlessButtonStyle" />
</RelativeLayout> </RelativeLayout>

21
src/com/android/settings/AppHeader.java
View File

@@ -58,7 +58,7 @@ public class AppHeader {
} }
public static View setupHeaderView(final Activity activity, Drawable icon, CharSequence label, 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) { View bar) {
final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon); final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);
appIcon.setImageDrawable(icon); appIcon.setImageDrawable(icon);
@@ -69,19 +69,20 @@ public class AppHeader {
final TextView appName = (TextView) bar.findViewById(R.id.app_name); final TextView appName = (TextView) bar.findViewById(R.id.app_name);
appName.setText(label); appName.setText(label);
final View appSettings = bar.findViewById(R.id.app_settings); if (pkgName != null && !pkgName.equals(Utils.OS_PKG)) {
if (includeAppInfo && pkgName != null && !pkgName.equals(Utils.OS_PKG)) { bar.setClickable(true);
appSettings.setClickable(true); bar.setOnClickListener(new OnClickListener() {
appSettings.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AppInfoBase.startAppInfoFragment(InstalledAppDetails.class, if (includeAppInfo) {
R.string.application_info_label, pkgName, uid, activity, AppInfoBase.startAppInfoFragment(InstalledAppDetails.class,
INSTALLED_APP_DETAILS); R.string.application_info_label, pkgName, uid, activity,
INSTALLED_APP_DETAILS);
} else {
activity.finish();
}
} }
}); });
} else {
appSettings.setVisibility(View.GONE);
} }
return bar; return bar;
} }