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/notification/AppNotificationSettings.java

@@ -44,7 +44,6 @@ import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.applications.AppInfoWithHeader;
 import com.android.settings.notification.NotificationBackend.AppRow;
 
 import java.util.List;
@@ -86,8 +85,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         }
         mCreated = true;
         if (mAppRow == null) return;
-        AppHeader.createAppHeader(this, mAppRow.icon, mAppRow.label,
-                AppInfoWithHeader.getInfoIntent(this, mAppRow.pkg));
+        AppHeader.createAppHeader(this, mAppRow.icon, mAppRow.label, mAppRow.pkg, mAppRow.uid);
     }
 
     @Override