Merge "Add Activity methods for icons and labels."

diff --combined api/current.txt
index a56ea68,4efe1da..4c1f6fa
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -3156,6 -3156,8 +3156,8 @@@ package android.app 
      method public final void setProgressBarIndeterminate(boolean);
      method public final void setProgressBarIndeterminateVisibility(boolean);
      method public final void setProgressBarVisibility(boolean);
+     method public void setRecentsIcon(android.graphics.Bitmap);
+     method public void setRecentsLabel(java.lang.CharSequence);
      method public void setRequestedOrientation(int);
      method public final void setResult(int);
      method public final void setResult(int, android.content.Intent);
@@@ -3276,6 -3278,8 +3278,8 @@@
      method public void readFromParcel(android.os.Parcel);
      method public void writeToParcel(android.os.Parcel, int);
      field public static final android.os.Parcelable.Creator CREATOR;
+     field public android.graphics.Bitmap activityIcon;
+     field public java.lang.CharSequence activityLabel;
      field public android.content.Intent baseIntent;
      field public java.lang.CharSequence description;
      field public int id;
@@@ -4210,7 -4214,6 +4214,7 @@@
      field public static final java.lang.String CATEGORY_MESSAGE = "msg";
      field public static final java.lang.String CATEGORY_PROGRESS = "progress";
      field public static final java.lang.String CATEGORY_PROMO = "promo";
 +    field public static final java.lang.String CATEGORY_RECOMMENDATION = "recommendation";
      field public static final java.lang.String CATEGORY_SERVICE = "service";
      field public static final java.lang.String CATEGORY_SOCIAL = "social";
      field public static final java.lang.String CATEGORY_STATUS = "status";