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/DataUsageSummary.java

@@ -486,8 +486,9 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
             // When we are going straight to an app then we are coming from App Info and want
             // a header at the top.
             FrameLayout pinnedHeader = (FrameLayout) rootView.findViewById(R.id.pinned_header);
-            AppHeader.createAppHeader(getActivity(), detail.icon, detail.label, null, pinnedHeader);
-            AppDetailsFragment.show(DataUsageSummary.this, app, detail.label, true);
+            AppHeader.createAppHeader(getActivity(), detail.icon, detail.label,
+                    mShowAppImmediatePkg, uid, pinnedHeader);
+            AppDetailsFragment.show(DataUsageSummary.this, app, detail.label, false);
         } catch (NameNotFoundException e) {
             Log.w(TAG, "Could not find " + mShowAppImmediatePkg, e);
             Toast.makeText(getActivity(), getString(R.string.unknown_app), Toast.LENGTH_LONG)