Make the app header bar more consistent.

- Don't include info link if just came from app info page
- include back button on app info page when launched from header
Bug: 22203029

Change-Id: I737332a487c41e0a93d161b55659700a1f936844

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

@@ -16,19 +16,13 @@
 
 package com.android.settings.applications;
 
-import android.app.Fragment;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.settings.AppHeader;
 
 public abstract class AppInfoWithHeader extends AppInfoBase {
 
-    public static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
-
     private boolean mCreated;
 
     @Override
@@ -41,24 +35,7 @@ public abstract class AppInfoWithHeader extends AppInfoBase {
         mCreated = true;
         if (mPackageInfo == null) return;
         AppHeader.createAppHeader(this, mPackageInfo.applicationInfo.loadIcon(mPm),
-                mPackageInfo.applicationInfo.loadLabel(mPm), getInfoIntent(this, mPackageName), 0);
-    }
-
-    public static Intent getInfoIntent(Fragment fragment, String packageName) {
-        Bundle args = fragment.getArguments();
-        Intent intent = fragment.getActivity().getIntent();
-        boolean showInfo = true;
-        if (args != null && args.getBoolean(EXTRA_HIDE_INFO_BUTTON, false)) {
-            showInfo = false;
-        }
-        if (intent != null && intent.getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)) {
-            showInfo = false;
-        }
-        Intent infoIntent = null;
-        if (showInfo) {
-            infoIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-            infoIntent.setData(Uri.fromParts("package", packageName, null));
-        }
-        return infoIntent;
+                mPackageInfo.applicationInfo.loadLabel(mPm), mPackageName,
+                mPackageInfo.applicationInfo.uid, 0);
     }
 }