From 80f844229137cb0d78689ea61aea37da4c770c8c Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Mon, 6 Jun 2011 17:39:44 -0700 Subject: [PATCH] Add v13 to the compatibility package. Also remove ApiDemos from the package and instead add each library-specific sample app to each v## folder. Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381 --- build/Android.mk | 10 ++++++++++ build/sdk.atree | 6 ++++-- sdk/compatibility_README.txt | 16 ++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index 7e5d180b..8990d92b 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -75,3 +75,13 @@ $(android-support-v4_full_target): $(android-support-v4_build_module) $(hide)$(ACP) $< $@ ALL_SDK_FILES += $(android-support-v4_full_target) + +android-support-v13_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android-support-v13_intermediates/javalib.jar +android-support-v13_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android-support-v13_intermediates +android-support-v13_full_target := $(android-support-v13_intermediates)/android-support-v13.jar +$(android-support-v13_full_target): $(android-support-v13_build_module) + @echo Package android-support-v13.jar: $@ + $(hide)mkdir -p $(dir $@) + $(hide)$(ACP) $< $@ + +ALL_SDK_FILES += $(android-support-v13_full_target) diff --git a/build/sdk.atree b/build/sdk.atree index e5da0a20..97317c46 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -154,7 +154,6 @@ development/samples/source.properties samples/${PLATFORM_NAME}/source.pro development/samples/AccessibilityService samples/${PLATFORM_NAME}/AccessibilityService development/samples/AccelerometerPlay samples/${PLATFORM_NAME}/AccelerometerPlay development/samples/ApiDemos samples/${PLATFORM_NAME}/ApiDemos -${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar samples/${PLATFORM_NAME}/ApiDemos/libs/android-support-v4.jar development/samples/BackupRestore samples/${PLATFORM_NAME}/BackupRestore development/samples/BasicGLSurfaceView samples/${PLATFORM_NAME}/BasicGLSurfaceView development/samples/BluetoothChat samples/${PLATFORM_NAME}/BluetoothChat @@ -210,4 +209,7 @@ development/sdk/compatibility_README.txt sdk/files/sdk_files_NOTICE.txt extras/android/compatibility/NOTICE.txt ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar extras/android/compatibility/v4/android-support-v4.jar frameworks/support/v4 extras/android/compatibility/v4/src -development/samples/ApiDemos extras/android/compatibility/v4/samples/ApiDemos +development/samples/Support4Demos extras/android/compatibility/v4/samples/Support4Demos +${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar extras/android/compatibility/v13/android-support-v13.jar +frameworks/support/v13 extras/android/compatibility/v13/src +development/samples/Support13Demos extras/android/compatibility/v13/samples/Support13Demos diff --git a/sdk/compatibility_README.txt b/sdk/compatibility_README.txt index d1f15ed9..7752b3b0 100644 --- a/sdk/compatibility_README.txt +++ b/sdk/compatibility_README.txt @@ -4,7 +4,10 @@ This SDK component contains static libraries providing access to newer APIs on older platforms. To use those libraries, simply copy them as static libraries into your project. -"v4" provides support for using new APIs on Android API 4 (1.6 - Donut) and above. +Each library is called v, indicating the minimum API level that they require. + + +*** V4 *** v4/android-support-v4.jar contains: - Fragment API. New in API 11 (3.0 - Honeycomb). http://developer.android.com/reference/android/app/Fragment.html @@ -13,4 +16,13 @@ v4/android-support-v4.jar contains: - MenuCompat allows calling MenuItem.setShowAsAction which only exists on API 11. v4/src/ is the source code for the compatibility library -v4/samples/ provides a version of ApiDemos using the library. \ No newline at end of file +v4/samples/ provides a sample app using the library. + + +*** V13 *** + +Provides the same features as v4, plus: +- FragmentPagerAdapter: Implementation of PagerAdapter that represents each page as a Fragment. + +v13/src/ is the source code for the compatibility library, not including the v4 source +v13/samples/ provides a sample app using the library. -- 2.11.0