diff -r -p1 android-support-package-rev-6/v4 <sdk-home>/extras/android/support/v4/src

diff

Only in v4/: Android.mk
diff -r -p1 v4/honeycomb/android/support/v4/app/ActivityCompatHoneycomb.java /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/honeycomb/android/support/v4/app/ActivityCompatHoneycomb.java
*** v4/honeycomb/android/support/v4/app/ActivityCompatHoneycomb.java	2012-01-10 15:40:54.420339000 +0900
--- /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/honeycomb/android/support/v4/app/ActivityCompatHoneycomb.java	2012-03-22 13:55:41.000000000 +0900
*************** package android.support.v4.app;
*** 19,20 ****
--- 19,21 ----
  import android.app.Activity;
+ import android.content.Intent;
  
*************** class ActivityCompatHoneycomb {
*** 30,31 ****
--- 31,36 ----
      }
+ 
+     static void startActivities(Activity activity, Intent[] intents) {
+         activity.startActivities(intents);
+     }
  
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/honeycomb/android/support/v4/app: NotificationCompatHoneycomb.java
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/honeycomb/android/support/v4/app: TaskStackBuilderHoneycomb.java
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/ics/android/support/v4: app
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app: ActivityCompat.java
diff -r -p1 v4/java/android/support/v4/app/FragmentActivity.java /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app/FragmentActivity.java
*** v4/java/android/support/v4/app/FragmentActivity.java	2012-03-22 14:01:50.744156000 +0900
--- /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app/FragmentActivity.java	2012-03-22 13:55:41.000000000 +0900
*************** package android.support.v4.app;
*** 18,19 ****
--- 18,20 ----
  
+ import android.app.Activity;
  import android.content.Context;
*************** import java.util.HashMap;
*** 39,42 ****
  
- import com.google.android.maps.MapActivity;
- 
  /**
--- 40,41 ----
*************** import com.google.android.maps.MapActivi
*** 68,70 ****
   */
! public class FragmentActivity extends MapActivity {
      private static final String TAG = "FragmentActivity";
--- 67,69 ----
   */
! public class FragmentActivity extends Activity {
      private static final String TAG = "FragmentActivity";
*************** public class FragmentActivity extends Ma
*** 151,153 ****
                          + Integer.toHexString(requestCode));
-                 return;
              }
--- 150,151 ----
*************** public class FragmentActivity extends Ma
*** 564,566 ****
  
!     void supportInvalidateOptionsMenu() {
          if (android.os.Build.VERSION.SDK_INT >= HONEYCOMB) {
--- 562,569 ----
  
!     /**
!      * Invalidate the activity's options menu. This will cause relevant presentations
!      * of the menu to fully update via calls to onCreateOptionsMenu and
!      * onPrepareOptionsMenu the next time the menu is requested.
!      */
!     public void supportInvalidateOptionsMenu() {
          if (android.os.Build.VERSION.SDK_INT >= HONEYCOMB) {
*************** public class FragmentActivity extends Ma
*** 730,736 ****
      }
- 
-     @Override
-     protected boolean isRouteDisplayed() {
-         return false;
-     }
  }
--- 733,734 ----
Only in v4/java/android/support/v4/app: Fragment.java.orig
Only in v4/java/android/support/v4/app: Fragment.java.rej
Only in v4/java/android/support/v4/app: FragmentManager.java.orig
Only in v4/java/android/support/v4/app: FragmentManager.java.rej
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app: NavUtils.java
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app: NotificationCompat.java
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app: ShareCompat.java
Only in /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/app: TaskStackBuilder.java
diff -r -p1 v4/java/android/support/v4/content/IntentCompat.java /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/content/IntentCompat.java
*** v4/java/android/support/v4/content/IntentCompat.java	2012-01-10 15:40:53.147549000 +0900
--- /home/taro/Android/android-sdk-linux/extras/android/support/v4/src/java/android/support/v4/content/IntentCompat.java	2012-03-22 13:55:41.000000000 +0900
*************** package android.support.v4.content;
*** 18,19 ****
--- 18,21 ----
  
+ import android.content.Context;
+ 
  /**
*************** public class IntentCompat {
*** 95,96 ****
--- 97,120 ----
              "android.intent.extra.changed_uid_list";
+ 
+     /**
+      * If set in an Intent passed to {@link Context#startActivity Context.startActivity()},
+      * this flag will cause a newly launching task to be placed on top of the current
+      * home activity task (if there is one). That is, pressing back from the task
+      * will always return the user to home even if that was not the last activity they
+      * saw. This can only be used in conjunction with
+      * {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}.
+      */
+     public static final int FLAG_ACTIVITY_TASK_ON_HOME = 0x00004000;
+ 
+     /**
+      * If set in an Intent passed to {@link Context#startActivity Context.startActivity()},
+      * this flag will cause any existing task that would be associated with the
+      * activity to be cleared before the activity is started.  That is, the activity
+      * becomes the new root of an otherwise empty task, and any old activities
+      * are finished.  This can only be used in conjunction with
+      * {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}.
+      *
+      * <p>This flag will only be obeyed on devices supporting API 11 or higher.</p>
+      */
+     public static final int FLAG_ACTIVITY_CLEAR_TASK = 0x00008000;
  }