am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools."
* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
Fix library paths for SDK tools.
diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk
index 8c0f705..99133e8 100644
--- a/apps/Development/Android.mk
+++ b/apps/Development/Android.mk
@@ -3,7 +3,7 @@
LOCAL_MODULE_TAGS := eng
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common org.apache.http.legacy
LOCAL_SRC_FILES := $(call all-subdir-java-files) \
src/com/android/development/IRemoteService.aidl \
diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index 5847201..3ac8190 100644
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -47,6 +47,7 @@
<application android:label="Dev Tools"
android:icon="@mipmap/ic_launcher_devtools">
+ <uses-library android:name="org.apache.http.legacy" android:required="false" />
<uses-library android:name="android.test.runner" />
diff --git a/apps/Fallback/res/values-sl/strings.xml b/apps/Fallback/res/values-sl/strings.xml
index 322f466..16f30ab 100644
--- a/apps/Fallback/res/values-sl/strings.xml
+++ b/apps/Fallback/res/values-sl/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="appTitle" msgid="161410001913116606">"Nadomestni program"</string>
+ <string name="appTitle" msgid="161410001913116606">"Nadomestna aplikacija"</string>
<string name="title" msgid="8156274565006125136">"Dejanje ni podprto."</string>
<string name="error" msgid="6539615832923362301">"To dejanje trenutno še ni podprto."</string>
</resources>
diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk
index a028900..f74d23c 100644
--- a/build/build_android_stubs.mk
+++ b/build/build_android_stubs.mk
@@ -19,6 +19,7 @@
# resource files here.
intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates
full_target := $(intermediates)/classes.jar
+jack_lib := $(intermediates)/classes.jack
src_dir := $(intermediates)/src
classes_dir := $(intermediates)/classes
framework_res_package := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
@@ -49,3 +50,6 @@
$(hide) mkdir -p $(dir $@)
$(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
$(hide) jar -u0f $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) resources.arsc
+
+$(jack_lib) : $(full_target) $(JILL_JAR) $(JACK_JAR)
+ $(transform-jar-to-jack)
\ No newline at end of file
diff --git a/build/sdk.atree b/build/sdk.atree
index 0628173..613fb90 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -54,16 +54,15 @@
development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xml
# systrace
-external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
-external/chromium-trace/systrace-legacy.py platform-tools/systrace/systrace-legacy.py
-external/chromium-trace/script.js platform-tools/systrace/script.js
-external/chromium-trace/style.css platform-tools/systrace/style.css
-external/chromium-trace/prefix.html platform-tools/systrace/prefix.html
-external/chromium-trace/suffix.html platform-tools/systrace/suffix.html
-external/chromium-trace/LICENSE platform-tools/systrace/LICENSE
-external/chromium-trace/AUTHORS platform-tools/systrace/AUTHORS
-external/chromium-trace/NOTICE platform-tools/systrace/NOTICE
-external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION
+external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
+external/chromium-trace/systrace-legacy.py platform-tools/systrace/systrace-legacy.py
+external/chromium-trace/systrace_trace_viewer.html platform-tools/systrace/systrace_trace_viewer.html
+external/chromium-trace/prefix.html platform-tools/systrace/prefix.html
+external/chromium-trace/suffix.html platform-tools/systrace/suffix.html
+external/chromium-trace/LICENSE platform-tools/systrace/LICENSE
+external/chromium-trace/AUTHORS platform-tools/systrace/AUTHORS
+external/chromium-trace/NOTICE platform-tools/systrace/NOTICE
+external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION
##############################################################################
# Build Tools Component
@@ -251,11 +250,6 @@
developers/build/prebuilts/gradle/MediaRecorder/ samples/${PLATFORM_NAME}/media/MediaRecorder
developers/build/prebuilts/gradle/BasicMediaRouter/ samples/${PLATFORM_NAME}/media/BasicMediaRouter
developers/build/prebuilts/gradle/BasicMediaDecoder/ samples/${PLATFORM_NAME}/media/BasicMediaDecoder
-developers/build/prebuilts/gradle/MediaBrowserService/ samples/${PLATFORM_NAME}/media/MediaBrowserService
-developers/build/prebuilts/gradle/BasicNotifications/ samples/${PLATFORM_NAME}/notification/BasicNotifications
-developers/build/prebuilts/gradle/CustomNotifications/ samples/${PLATFORM_NAME}/notification/CustomNotifications
-developers/build/prebuilts/gradle/LNotifications/ samples/${PLATFORM_NAME}/notification/LNotifications
-developers/build/prebuilts/gradle/MessagingService/ samples/${PLATFORM_NAME}/notification/MessagingService
developers/build/prebuilts/gradle/BorderlessButtons/ samples/${PLATFORM_NAME}/ui/BorderlessButtons
developers/build/prebuilts/gradle/BasicAccessibility/ samples/${PLATFORM_NAME}/ui/BasicAccessibility
developers/build/prebuilts/gradle/CustomChoiceList/ samples/${PLATFORM_NAME}/ui/CustomChoiceList
@@ -265,6 +259,8 @@
developers/build/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ListPopupMenu
developers/build/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ShareActionProvider
developers/build/prebuilts/gradle/ActionBarCompat-Basic/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-Basic
+developers/build/prebuilts/gradle/BasicNotifications/ samples/${PLATFORM_NAME}/ui/BasicNotifications
+developers/build/prebuilts/gradle/CustomNotifications/ samples/${PLATFORM_NAME}/ui/CustomNotifications
developers/build/prebuilts/gradle/DoneBar/ samples/${PLATFORM_NAME}/ui/DoneBar
developers/build/prebuilts/gradle/BasicImmersiveMode/ samples/${PLATFORM_NAME}/ui/BasicImmersiveMode
developers/build/prebuilts/gradle/AdvancedImmersiveMode/ samples/${PLATFORM_NAME}/ui/AdvancedImmersiveMode
@@ -305,6 +301,7 @@
developers/build/prebuilts/gradle/AppRestrictionSchema samples/${PLATFORM_NAME}/admin/AppRestrictionSchema
developers/build/prebuilts/gradle/RecyclerView samples/${PLATFORM_NAME}/ui/views/RecyclerView
developers/build/prebuilts/gradle/CardView samples/${PLATFORM_NAME}/ui/views/CardView
+developers/build/prebuilts/gradle/LNotifications samples/${PLATFORM_NAME}/ui/notifications/LNotifications
developers/build/prebuilts/gradle/DrawableTinting samples/${PLATFORM_NAME}/ui/DrawableTinting
developers/build/prebuilts/gradle/Interpolator samples/${PLATFORM_NAME}/ui/Interpolator
developers/build/prebuilts/gradle/PdfRendererBasic samples/${PLATFORM_NAME}/ui/graphics/PdfRendererBasic
@@ -340,7 +337,6 @@
# Old sample tree
development/samples/AccelerometerPlay samples/${PLATFORM_NAME}/legacy/AccelerometerPlay
-development/samples/ActionBarCompat samples/${PLATFORM_NAME}/legacy/ActionBarCompat
development/samples/AndroidBeamDemo samples/${PLATFORM_NAME}/legacy/AndroidBeamDemo
development/samples/ApiDemos samples/${PLATFORM_NAME}/legacy/ApiDemos
development/samples/AppNavigation samples/${PLATFORM_NAME}/legacy/AppNavigation
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index 0cc0a3c..f9a715c 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="packages/apps/Bluetooth/lib/mapapi"/>
<classpathentry kind="src" path="packages/apps/Bluetooth/src"/>
<classpathentry kind="src" path="packages/apps/Browser/src"/>
<classpathentry kind="src" path="packages/apps/Calendar/src"/>
@@ -9,6 +10,7 @@
<classpathentry kind="src" path="packages/apps/Contacts/src"/>
<classpathentry kind="src" path="packages/apps/ContactsCommon/src"/>
<classpathentry kind="src" path="packages/apps/Dialer/src"/>
+ <classpathentry kind="src" path="packages/apps/Email/provider_src"/>
<classpathentry kind="src" path="packages/apps/Email/src"/>
<classpathentry kind="src" path="packages/apps/Email/emailcommon/src"/>
<classpathentry kind="src" path="packages/apps/HTMLViewer/src"/>
@@ -29,6 +31,7 @@
<classpathentry kind="src" path="packages/providers/TelephonyProvider/src"/>
<classpathentry kind="src" path="packages/services/Telecomm/src"/>
<classpathentry kind="src" path="packages/services/Telecomm/tests/src"/>
+ <classpathentry kind="src" path="packages/services/Telephony/sip/src"/>
<classpathentry kind="src" path="packages/services/Telephony/src"/>
<classpathentry kind="src" path="packages/services/Telephony/common/src"/>
<classpathentry kind="src" path="packages/services/Telephony/tests/src"/>
@@ -52,6 +55,7 @@
<classpathentry kind="src" path="frameworks/base/opengl/java"/>
<classpathentry kind="src" path="frameworks/base/packages/FusedLocation/src"/>
<classpathentry kind="src" path="frameworks/base/packages/Keyguard/src"/>
+ <classpathentry kind="src" path="frameworks/base/packages/SettingsLib/src"/>
<classpathentry kind="src" path="frameworks/base/packages/SettingsProvider/src"/>
<classpathentry kind="src" path="frameworks/base/packages/SystemUI/src"/>
<classpathentry kind="src" path="frameworks/base/phone/java"/>
@@ -71,6 +75,7 @@
<classpathentry kind="src" path="frameworks/ex/camera2/public/src"/>
<classpathentry kind="src" path="frameworks/ex/common/java"/>
<classpathentry kind="src" path="frameworks/ex/variablespeed/src"/>
+ <classpathentry kind="src" path="frameworks/opt/bitmap/src"/>
<classpathentry kind="src" path="frameworks/opt/calendar/src"/>
<classpathentry kind="src" path="frameworks/opt/chips/src"/>
<classpathentry kind="src" path="frameworks/opt/colorpicker/src"/>
@@ -85,10 +90,16 @@
<classpathentry kind="src" path="frameworks/opt/telephony/src/java"/>
<classpathentry kind="src" path="frameworks/opt/timezonepicker/src"/>
<classpathentry kind="src" path="frameworks/opt/vcard/java"/>
+ <classpathentry kind="src" path="frameworks/support/v7/appcompat/src"/>
+ <classpathentry kind="src" path="frameworks/support/v7/cardview/api21"/>
+ <classpathentry kind="src" path="frameworks/support/v7/cardview/base"/>
+ <classpathentry kind="src" path="frameworks/support/v7/cardview/eclair-mr1"/>
+ <classpathentry kind="src" path="frameworks/support/v7/cardview/jellybean-mr1"/>
+ <classpathentry kind="src" path="frameworks/support/v7/cardview/src"/>
+ <classpathentry kind="src" path="frameworks/support/v7/palette/src/main/java"/>
<classpathentry kind="src" path="frameworks/support/v13/java"/>
<classpathentry kind="src" path="frameworks/support/v13/ics"/>
<classpathentry kind="src" path="frameworks/support/v13/ics-mr1"/>
- <classpathentry kind="src" path="frameworks/support/v7/palette/src"/>
<classpathentry kind="src" path="libcore/dalvik/src/main/java"/>
<classpathentry kind="src" path="libcore/dex/src/main/java"/>
<classpathentry kind="src" path="libcore/json/src/main/java"/>
@@ -103,6 +114,7 @@
<classpathentry kind="src" path="out/target/common/obj/APPS/PackageInstaller_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/QuickSearchBox_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/Settings_intermediates/src/src"/>
+ <classpathentry kind="src" path="out/target/common/obj/APPS/SettingsProvider_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/SystemUI_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/TeleService_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates/src/src"/>
@@ -122,6 +134,7 @@
<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates/src/src/java"/>
<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/voip-common_intermediates/src/src/java"/>
<classpathentry kind="src" path="out/target/common/R"/>
+ <classpathentry kind="src" path="external/apache-http/android/src"/>
<classpathentry kind="src" path="external/apache-http/src"/>
<classpathentry kind="src" path="external/bouncycastle/bcprov/src/main/java"/>
<classpathentry kind="src" path="external/easymock/src"/>
@@ -131,7 +144,10 @@
<classpathentry kind="src" path="external/ksoap2/kobjects"/>
<classpathentry kind="src" path="external/ksoap2/ksoap2-base/src/main/java"/>
<classpathentry kind="src" path="external/ksoap2/ksoap2-j2se/src/main/java"/>
+ <classpathentry kind="src" path="external/libphonenumber/geocoder/src"/>
+ <classpathentry kind="src" path="external/libphonenumber/internal/prefixmapper/src"/>
<classpathentry kind="src" path="external/libphonenumber/java/src"/>
+ <classpathentry kind="src" path="external/libphonenumber/libphonenumber/src"/>
<classpathentry kind="src" path="external/mp4parser/isoparser/src/main/java"/>
<classpathentry kind="src" path="external/nist-sip/java"/>
<classpathentry kind="src" path="external/objenesis/main/src"/>
@@ -147,9 +163,8 @@
<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-support-v13_intermediates/javalib.jar"/>
<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-common_intermediates/javalib.jar"/>
<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/guava_intermediates/javalib.jar"/>
- <classpathentry kind="lib" path="packages/apps/ContactsCommon/libs/geocoder-2.9.jar"/>
- <classpathentry kind="lib" path="packages/apps/ContactsCommon/libs/libphonenumber-5.8.jar"/>
<classpathentry kind="lib" path="packages/apps/Calculator/arity-2.1.2.jar"/>
<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/junit-runner_intermediates/javalib.jar"/>
+ <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/libphonenumber-platform_intermediates/javalib.jar"/>
<classpathentry kind="output" path="out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes"/>
</classpath>
diff --git a/samples/ActionBarCompat/Android.mk b/samples/ActionBarCompat/Android.mk
deleted file mode 100644
index d9da54a..0000000
--- a/samples/ActionBarCompat/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := samples
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ActionBarCompat
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/samples/ActionBarCompat/AndroidManifest.xml b/samples/ActionBarCompat/AndroidManifest.xml
deleted file mode 100644
index a78339b..0000000
--- a/samples/ActionBarCompat/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.actionbarcompat"
- android:versionCode="1"
- android:versionName="1.0">
-
- <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="14" />
- <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
- <supports-screens android:largeScreens="true"/>
-
- <application android:label="@string/app_name"
- android:icon="@drawable/ic_launcher"
- android:theme="@style/AppTheme">
- <activity android:name=".MainActivity" android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/samples/ActionBarCompat/_index.jd b/samples/ActionBarCompat/_index.jd
deleted file mode 100644
index 61b5e5e..0000000
--- a/samples/ActionBarCompat/_index.jd
+++ /dev/null
@@ -1,13 +0,0 @@
-page.tags="ActionBar", "UI", "Compatibility", "Support Library"
-sample.group=Input
-@jd:body
-
-<p>This sample shows how to use the action bar design pattern on pre-API 11 devices and the built-in
-<a href="../../../reference/android/app/ActionBar.html">ActionBar</a> on devices supporting API
-11 or greater. The example 'compatible' action bar, instantiated on pre-Android 3.0 devices,
-uses the same <a href="../../../guide/topics/resources/menu-resource.html">menu resource</a>-based
-action item definition mechanism as the new framework API, even supporting the
-<code>android:showAsAction</code> attribute to a limited extent.</p>
-
-<img alt="" src="../images/ActionBarCompat1.png" height="320" />
-<img alt="" src="../images/ActionBarCompat2.png" height="320" />
\ No newline at end of file
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/actionbar_shadow.9.png b/samples/ActionBarCompat/res/drawable-hdpi/actionbar_shadow.9.png
deleted file mode 100644
index 3c80a3f..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/actionbar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/ic_action_refresh.png b/samples/ActionBarCompat/res/drawable-hdpi/ic_action_refresh.png
deleted file mode 100644
index efe99e0..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/ic_action_refresh.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/ic_action_search.png b/samples/ActionBarCompat/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index f6719d2..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/ic_action_share.png b/samples/ActionBarCompat/res/drawable-hdpi/ic_action_share.png
deleted file mode 100644
index 7d0b872..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/ic_action_share.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/ic_home.png b/samples/ActionBarCompat/res/drawable-hdpi/ic_home.png
deleted file mode 100644
index 7e52ff5..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/ic_home.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/ic_launcher.png b/samples/ActionBarCompat/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index e4b0492..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-hdpi/ic_menu_share.png b/samples/ActionBarCompat/res/drawable-hdpi/ic_menu_share.png
deleted file mode 100755
index a78bf7a..0000000
--- a/samples/ActionBarCompat/res/drawable-hdpi/ic_menu_share.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/actionbar_shadow.9.png b/samples/ActionBarCompat/res/drawable-mdpi/actionbar_shadow.9.png
deleted file mode 100644
index cae1778..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/actionbar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/ic_action_refresh.png b/samples/ActionBarCompat/res/drawable-mdpi/ic_action_refresh.png
deleted file mode 100644
index a85eee3..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/ic_action_refresh.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/ic_action_search.png b/samples/ActionBarCompat/res/drawable-mdpi/ic_action_search.png
deleted file mode 100755
index 45d2398..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/ic_action_share.png b/samples/ActionBarCompat/res/drawable-mdpi/ic_action_share.png
deleted file mode 100644
index 26a39bd..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/ic_action_share.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/ic_home.png b/samples/ActionBarCompat/res/drawable-mdpi/ic_home.png
deleted file mode 100644
index 949b4aa..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/ic_home.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/ic_launcher.png b/samples/ActionBarCompat/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 78d0e29..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-mdpi/ic_menu_share.png b/samples/ActionBarCompat/res/drawable-mdpi/ic_menu_share.png
deleted file mode 100755
index 3329b6b..0000000
--- a/samples/ActionBarCompat/res/drawable-mdpi/ic_menu_share.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-xhdpi/actionbar_shadow.9.png b/samples/ActionBarCompat/res/drawable-xhdpi/actionbar_shadow.9.png
deleted file mode 100644
index 30778e3..0000000
--- a/samples/ActionBarCompat/res/drawable-xhdpi/actionbar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_refresh.png b/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_refresh.png
deleted file mode 100644
index 6ce9376..0000000
--- a/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_refresh.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_search.png b/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index f89c4e9..0000000
--- a/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_share.png b/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_share.png
deleted file mode 100644
index 47b27d1..0000000
--- a/samples/ActionBarCompat/res/drawable-xhdpi/ic_action_share.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-xhdpi/ic_home.png b/samples/ActionBarCompat/res/drawable-xhdpi/ic_home.png
deleted file mode 100644
index 03eb53d..0000000
--- a/samples/ActionBarCompat/res/drawable-xhdpi/ic_home.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable-xhdpi/ic_launcher.png b/samples/ActionBarCompat/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index 485f7be..0000000
--- a/samples/ActionBarCompat/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/samples/ActionBarCompat/res/drawable/actionbar_compat_item.xml b/samples/ActionBarCompat/res/drawable/actionbar_compat_item.xml
deleted file mode 100644
index 4b3960c..0000000
--- a/samples/ActionBarCompat/res/drawable/actionbar_compat_item.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/actionbar_compat_item_pressed"
- android:state_pressed="true" />
- <item android:drawable="@drawable/actionbar_compat_item_focused"
- android:state_focused="true" />
- <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/samples/ActionBarCompat/res/drawable/actionbar_compat_item_focused.xml b/samples/ActionBarCompat/res/drawable/actionbar_compat_item_focused.xml
deleted file mode 100644
index 04811d3..0000000
--- a/samples/ActionBarCompat/res/drawable/actionbar_compat_item_focused.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="#ef7000" />
-</shape>
diff --git a/samples/ActionBarCompat/res/drawable/actionbar_compat_item_pressed.xml b/samples/ActionBarCompat/res/drawable/actionbar_compat_item_pressed.xml
deleted file mode 100644
index 72ff4b4..0000000
--- a/samples/ActionBarCompat/res/drawable/actionbar_compat_item_pressed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="#eda700" />
-</shape>
diff --git a/samples/ActionBarCompat/res/layout-v11/actionbar_indeterminate_progress.xml b/samples/ActionBarCompat/res/layout-v11/actionbar_indeterminate_progress.xml
deleted file mode 100644
index c05750e..0000000
--- a/samples/ActionBarCompat/res/layout-v11/actionbar_indeterminate_progress.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center">
- <ProgressBar android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:layout_gravity="center"
- style="?android:attr/indeterminateProgressStyle" />
-</FrameLayout>
diff --git a/samples/ActionBarCompat/res/layout/actionbar_compat.xml b/samples/ActionBarCompat/res/layout/actionbar_compat.xml
deleted file mode 100644
index ae6c44b..0000000
--- a/samples/ActionBarCompat/res/layout/actionbar_compat.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@id/actionbar_compat"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="horizontal" />
diff --git a/samples/ActionBarCompat/res/layout/main.xml b/samples/ActionBarCompat/res/layout/main.xml
deleted file mode 100644
index a58a346..0000000
--- a/samples/ActionBarCompat/res/layout/main.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
- <Button android:id="@+id/toggle_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:text="@string/toggle_title" />
-</FrameLayout>
diff --git a/samples/ActionBarCompat/res/menu/main.xml b/samples/ActionBarCompat/res/menu/main.xml
deleted file mode 100644
index a306a3c..0000000
--- a/samples/ActionBarCompat/res/menu/main.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_refresh"
- android:title="@string/menu_refresh"
- android:icon="@drawable/ic_action_refresh"
- android:orderInCategory="1"
- android:showAsAction="always" />
- <item android:id="@+id/menu_search"
- android:title="@string/menu_search"
- android:icon="@drawable/ic_action_search"
- android:orderInCategory="0"
- android:showAsAction="always" />
-
- <item android:id="@+id/menu_share"
- android:title="@string/menu_share"
- android:icon="@drawable/ic_menu_share"
- android:orderInCategory="1"
- android:showAsAction="never" />
-</menu>
diff --git a/samples/ActionBarCompat/res/values-v11/styles.xml b/samples/ActionBarCompat/res/values-v11/styles.xml
deleted file mode 100644
index dc1aa7c..0000000
--- a/samples/ActionBarCompat/res/values-v11/styles.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
-
- <style name="AppTheme" parent="android:style/Theme.Holo.Light">
- <item name="android:actionBarStyle">@style/ActionBar</item>
- <item name="android:windowContentOverlay">@drawable/actionbar_shadow</item>
- </style>
-
- <style name="ActionBar" parent="android:style/Widget.Holo.Light.ActionBar">
- <item name="android:background">#eee</item>
- <item name="android:titleTextStyle">@style/ActionBarTitle</item>
- <item name="android:icon">@drawable/ic_home</item>
- </style>
-
- <style name="ActionBarTitle">
- <item name="android:textColor">@color/actionbar_title_color</item>
- </style>
-
-</resources>
diff --git a/samples/ActionBarCompat/res/values-v13/styles.xml b/samples/ActionBarCompat/res/values-v13/styles.xml
deleted file mode 100644
index 8a042b4..0000000
--- a/samples/ActionBarCompat/res/values-v13/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
-
- <style name="ActionBarTitle" parent="android:style/TextAppearance.Holo.Widget.ActionBar.Title">
- <item name="android:textColor">@color/actionbar_title_color</item>
- </style>
-
-</resources>
diff --git a/samples/ActionBarCompat/res/values/attrs.xml b/samples/ActionBarCompat/res/values/attrs.xml
deleted file mode 100644
index c59822c..0000000
--- a/samples/ActionBarCompat/res/values/attrs.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
-
- <declare-styleable name="AppTheme">
- <attr name="actionbarCompatTitleStyle" format="reference" />
- <attr name="actionbarCompatItemStyle" format="reference" />
- <attr name="actionbarCompatItemHomeStyle" format="reference" />
- <attr name="actionbarCompatProgressIndicatorStyle" format="reference" />
- </declare-styleable>
-
- <declare-styleable name="BezelImageView">
- <attr name="maskDrawable" format="reference" />
- <attr name="borderDrawable" format="reference" />
- </declare-styleable>
-
-</resources>
diff --git a/samples/ActionBarCompat/res/values/colors.xml b/samples/ActionBarCompat/res/values/colors.xml
deleted file mode 100644
index 4edc6d6..0000000
--- a/samples/ActionBarCompat/res/values/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
- <color name="actionbar_title_color">#224894</color>
-</resources>
diff --git a/samples/ActionBarCompat/res/values/dimens.xml b/samples/ActionBarCompat/res/values/dimens.xml
deleted file mode 100644
index 67c8436..0000000
--- a/samples/ActionBarCompat/res/values/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
- <dimen name="actionbar_compat_height">48dp</dimen>
- <dimen name="actionbar_compat_button_width">48dp</dimen>
- <dimen name="actionbar_compat_button_home_width">56dp</dimen>
-</resources>
diff --git a/samples/ActionBarCompat/res/values/ids.xml b/samples/ActionBarCompat/res/values/ids.xml
deleted file mode 100644
index e0a4745..0000000
--- a/samples/ActionBarCompat/res/values/ids.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
- <item type="id" name="actionbar_compat" />
- <item type="id" name="actionbar_compat_title" />
- <item type="id" name="actionbar_compat_item_refresh_progress" />
- <item type="id" name="actionbar_compat_item_refresh" />
- <item type="id" name="menu_refresh" />
-</resources>
diff --git a/samples/ActionBarCompat/res/values/strings.xml b/samples/ActionBarCompat/res/values/strings.xml
deleted file mode 100644
index 234aa78..0000000
--- a/samples/ActionBarCompat/res/values/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
- <string name="app_name">Action Bar Demo</string>
- <string name="alternate_title">An alternate title that is long</string>
- <string name="toggle_title">Toggle title</string>
-
- <string name="menu_refresh">Refresh</string>
- <string name="menu_search">Search</string>
- <string name="menu_share">Share</string>
-</resources>
diff --git a/samples/ActionBarCompat/res/values/styles.xml b/samples/ActionBarCompat/res/values/styles.xml
deleted file mode 100644
index 5d0c029..0000000
--- a/samples/ActionBarCompat/res/values/styles.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
- Copyright 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources>
-
- <style name="AppTheme" parent="android:style/Theme.Light">
- <item name="android:windowTitleSize">@dimen/actionbar_compat_height</item>
- <item name="android:windowTitleBackgroundStyle">@style/ActionBarCompat</item>
- <item name="android:windowContentOverlay">@drawable/actionbar_shadow</item>
-
- <!-- for programmatic instantiation -->
- <item name="actionbarCompatTitleStyle">@style/ActionBarCompatTitle</item>
- <item name="actionbarCompatItemStyle">@style/ActionBarCompatItem</item>
- <item name="actionbarCompatItemHomeStyle">@style/ActionBarCompatHomeItem</item>
- <item name="actionbarCompatProgressIndicatorStyle">@style/ActionBarCompatProgressIndicator</item>
- </style>
-
- <style name="ActionBarCompat">
- <item name="android:background">#eee</item>
- </style>
-
- <style name="ActionBarCompatItemBase">
- <!-- layout_width/height must be set in code -->
- <item name="android:scaleType">center</item>
- <item name="android:background">@drawable/actionbar_compat_item</item>
- </style>
-
- <style name="ActionBarCompatProgressIndicator" parent="android:style/Widget.ProgressBar.Large">
- <item name="android:indeterminate">true</item>
- </style>
-
- <style name="ActionBarCompatTitleBase">
- <item name="android:id">@id/actionbar_compat_title</item>
- <!-- layout_width/height/weight must be set in code -->
- <item name="android:gravity">center_vertical</item>
- <item name="android:textSize">18sp</item>
- <item name="android:paddingLeft">6dp</item>
- <item name="android:paddingRight">6dp</item>
- <item name="android:singleLine">true</item>
- <item name="android:ellipsize">marquee</item>
- </style>
-
- <style name="ActionBarCompatTitle" parent="style/ActionBarCompatTitleBase">
- <item name="android:textColor">@color/actionbar_title_color</item>
- </style>
-
- <style name="ActionBarCompatItem" parent="style/ActionBarCompatItemBase">
- </style>
-
- <style name="ActionBarCompatHomeItem" parent="style/ActionBarCompatItemBase">
- </style>
-
-</resources>
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarActivity.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarActivity.java
deleted file mode 100644
index 251e411..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarActivity.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-
-/**
- * A base activity that defers common functionality across app activities to an {@link
- * ActionBarHelper}.
- *
- * NOTE: dynamically marking menu items as invisible/visible is not currently supported.
- *
- * NOTE: this may used with the Android Compatibility Package by extending
- * android.support.v4.app.FragmentActivity instead of {@link Activity}.
- */
-public abstract class ActionBarActivity extends Activity {
- final ActionBarHelper mActionBarHelper = ActionBarHelper.createInstance(this);
-
- /**
- * Returns the {@link ActionBarHelper} for this activity.
- */
- protected ActionBarHelper getActionBarHelper() {
- return mActionBarHelper;
- }
-
- /**{@inheritDoc}*/
- @Override
- public MenuInflater getMenuInflater() {
- return mActionBarHelper.getMenuInflater(super.getMenuInflater());
- }
-
- /**{@inheritDoc}*/
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mActionBarHelper.onCreate(savedInstanceState);
- }
-
- /**{@inheritDoc}*/
- @Override
- protected void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
- mActionBarHelper.onPostCreate(savedInstanceState);
- }
-
- /**
- * Base action bar-aware implementation for
- * {@link Activity#onCreateOptionsMenu(android.view.Menu)}.
- *
- * Note: marking menu items as invisible/visible is not currently supported.
- */
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- boolean retValue = false;
- retValue |= mActionBarHelper.onCreateOptionsMenu(menu);
- retValue |= super.onCreateOptionsMenu(menu);
- return retValue;
- }
-
- /**{@inheritDoc}*/
- @Override
- protected void onTitleChanged(CharSequence title, int color) {
- mActionBarHelper.onTitleChanged(title, color);
- super.onTitleChanged(title, color);
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelper.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelper.java
deleted file mode 100644
index 075f993..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-
-/**
- * An abstract class that handles some common action bar-related functionality in the app. This
- * class provides functionality useful for both phones and tablets, and does not require any Android
- * 3.0-specific features, although it uses them if available.
- *
- * Two implementations of this class are {@link ActionBarHelperBase} for a pre-Honeycomb version of
- * the action bar, and {@link ActionBarHelperHoneycomb}, which uses the built-in ActionBar features
- * in Android 3.0 and later.
- */
-public abstract class ActionBarHelper {
- protected Activity mActivity;
-
- /**
- * Factory method for creating {@link ActionBarHelper} objects for a
- * given activity. Depending on which device the app is running, either a basic helper or
- * Honeycomb-specific helper will be returned.
- */
- public static ActionBarHelper createInstance(Activity activity) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- return new ActionBarHelperICS(activity);
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- return new ActionBarHelperHoneycomb(activity);
- } else {
- return new ActionBarHelperBase(activity);
- }
- }
-
- protected ActionBarHelper(Activity activity) {
- mActivity = activity;
- }
-
- /**
- * Action bar helper code to be run in {@link Activity#onCreate(android.os.Bundle)}.
- */
- public void onCreate(Bundle savedInstanceState) {
- }
-
- /**
- * Action bar helper code to be run in {@link Activity#onPostCreate(android.os.Bundle)}.
- */
- public void onPostCreate(Bundle savedInstanceState) {
- }
-
- /**
- * Action bar helper code to be run in {@link Activity#onCreateOptionsMenu(android.view.Menu)}.
- *
- * NOTE: Setting the visibility of menu items in <em>menu</em> is not currently supported.
- */
- public boolean onCreateOptionsMenu(Menu menu) {
- return true;
- }
-
- /**
- * Action bar helper code to be run in {@link Activity#onTitleChanged(CharSequence, int)}.
- */
- protected void onTitleChanged(CharSequence title, int color) {
- }
-
- /**
- * Sets the indeterminate loading state of the item with ID {@link R.id.menu_refresh}.
- * (where the item ID was menu_refresh).
- */
- public abstract void setRefreshActionItemState(boolean refreshing);
-
- /**
- * Returns a {@link MenuInflater} for use when inflating menus. The implementation of this
- * method in {@link ActionBarHelperBase} returns a wrapped menu inflater that can read
- * action bar metadata from a menu resource pre-Honeycomb.
- */
- public MenuInflater getMenuInflater(MenuInflater superMenuInflater) {
- return superMenuInflater;
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperBase.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperBase.java
deleted file mode 100644
index f70b54a..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperBase.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.os.Bundle;
-import android.view.InflateException;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A class that implements the action bar pattern for pre-Honeycomb devices.
- */
-public class ActionBarHelperBase extends ActionBarHelper {
- private static final String MENU_RES_NAMESPACE = "http://schemas.android.com/apk/res/android";
- private static final String MENU_ATTR_ID = "id";
- private static final String MENU_ATTR_SHOW_AS_ACTION = "showAsAction";
-
- protected Set<Integer> mActionItemIds = new HashSet<Integer>();
-
- protected ActionBarHelperBase(Activity activity) {
- super(activity);
- }
-
- /**{@inheritDoc}*/
- @Override
- public void onCreate(Bundle savedInstanceState) {
- mActivity.requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
- }
-
- /**{@inheritDoc}*/
- @Override
- public void onPostCreate(Bundle savedInstanceState) {
- mActivity.getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE,
- R.layout.actionbar_compat);
- setupActionBar();
-
- SimpleMenu menu = new SimpleMenu(mActivity);
- mActivity.onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, menu);
- mActivity.onPrepareOptionsMenu(menu);
- for (int i = 0; i < menu.size(); i++) {
- MenuItem item = menu.getItem(i);
- if (mActionItemIds.contains(item.getItemId())) {
- addActionItemCompatFromMenuItem(item);
- }
- }
- }
-
- /**
- * Sets up the compatibility action bar with the given title.
- */
- private void setupActionBar() {
- final ViewGroup actionBarCompat = getActionBarCompat();
- if (actionBarCompat == null) {
- return;
- }
-
- LinearLayout.LayoutParams springLayoutParams = new LinearLayout.LayoutParams(
- 0, ViewGroup.LayoutParams.FILL_PARENT);
- springLayoutParams.weight = 1;
-
- // Add Home button
- SimpleMenu tempMenu = new SimpleMenu(mActivity);
- SimpleMenuItem homeItem = new SimpleMenuItem(
- tempMenu, android.R.id.home, 0, mActivity.getString(R.string.app_name));
- homeItem.setIcon(R.drawable.ic_home);
- addActionItemCompatFromMenuItem(homeItem);
-
- // Add title text
- TextView titleText = new TextView(mActivity, null, R.attr.actionbarCompatTitleStyle);
- titleText.setLayoutParams(springLayoutParams);
- titleText.setText(mActivity.getTitle());
- actionBarCompat.addView(titleText);
- }
-
- /**{@inheritDoc}*/
- @Override
- public void setRefreshActionItemState(boolean refreshing) {
- View refreshButton = mActivity.findViewById(R.id.actionbar_compat_item_refresh);
- View refreshIndicator = mActivity.findViewById(
- R.id.actionbar_compat_item_refresh_progress);
-
- if (refreshButton != null) {
- refreshButton.setVisibility(refreshing ? View.GONE : View.VISIBLE);
- }
- if (refreshIndicator != null) {
- refreshIndicator.setVisibility(refreshing ? View.VISIBLE : View.GONE);
- }
- }
-
- /**
- * Action bar helper code to be run in {@link Activity#onCreateOptionsMenu(android.view.Menu)}.
- *
- * NOTE: This code will mark on-screen menu items as invisible.
- */
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Hides on-screen action items from the options menu.
- for (Integer id : mActionItemIds) {
- menu.findItem(id).setVisible(false);
- }
- return true;
- }
-
- /**{@inheritDoc}*/
- @Override
- protected void onTitleChanged(CharSequence title, int color) {
- TextView titleView = (TextView) mActivity.findViewById(R.id.actionbar_compat_title);
- if (titleView != null) {
- titleView.setText(title);
- }
- }
-
- /**
- * Returns a {@link android.view.MenuInflater} that can read action bar metadata on
- * pre-Honeycomb devices.
- */
- public MenuInflater getMenuInflater(MenuInflater superMenuInflater) {
- return new WrappedMenuInflater(mActivity, superMenuInflater);
- }
-
- /**
- * Returns the {@link android.view.ViewGroup} for the action bar on phones (compatibility action
- * bar). Can return null, and will return null on Honeycomb.
- */
- private ViewGroup getActionBarCompat() {
- return (ViewGroup) mActivity.findViewById(R.id.actionbar_compat);
- }
-
- /**
- * Adds an action button to the compatibility action bar, using menu information from a {@link
- * android.view.MenuItem}. If the menu item ID is <code>menu_refresh</code>, the menu item's
- * state can be changed to show a loading spinner using
- * {@link com.example.android.actionbarcompat.ActionBarHelperBase#setRefreshActionItemState(boolean)}.
- */
- private View addActionItemCompatFromMenuItem(final MenuItem item) {
- final int itemId = item.getItemId();
-
- final ViewGroup actionBar = getActionBarCompat();
- if (actionBar == null) {
- return null;
- }
-
- // Create the button
- ImageButton actionButton = new ImageButton(mActivity, null,
- itemId == android.R.id.home
- ? R.attr.actionbarCompatItemHomeStyle
- : R.attr.actionbarCompatItemStyle);
- actionButton.setLayoutParams(new ViewGroup.LayoutParams(
- (int) mActivity.getResources().getDimension(
- itemId == android.R.id.home
- ? R.dimen.actionbar_compat_button_home_width
- : R.dimen.actionbar_compat_button_width),
- ViewGroup.LayoutParams.FILL_PARENT));
- if (itemId == R.id.menu_refresh) {
- actionButton.setId(R.id.actionbar_compat_item_refresh);
- }
- actionButton.setImageDrawable(item.getIcon());
- actionButton.setScaleType(ImageView.ScaleType.CENTER);
- actionButton.setContentDescription(item.getTitle());
- actionButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- mActivity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, item);
- }
- });
-
- actionBar.addView(actionButton);
-
- if (item.getItemId() == R.id.menu_refresh) {
- // Refresh buttons should be stateful, and allow for indeterminate progress indicators,
- // so add those.
- ProgressBar indicator = new ProgressBar(mActivity, null,
- R.attr.actionbarCompatProgressIndicatorStyle);
-
- final int buttonWidth = mActivity.getResources().getDimensionPixelSize(
- R.dimen.actionbar_compat_button_width);
- final int buttonHeight = mActivity.getResources().getDimensionPixelSize(
- R.dimen.actionbar_compat_height);
- final int progressIndicatorWidth = buttonWidth / 2;
-
- LinearLayout.LayoutParams indicatorLayoutParams = new LinearLayout.LayoutParams(
- progressIndicatorWidth, progressIndicatorWidth);
- indicatorLayoutParams.setMargins(
- (buttonWidth - progressIndicatorWidth) / 2,
- (buttonHeight - progressIndicatorWidth) / 2,
- (buttonWidth - progressIndicatorWidth) / 2,
- 0);
- indicator.setLayoutParams(indicatorLayoutParams);
- indicator.setVisibility(View.GONE);
- indicator.setId(R.id.actionbar_compat_item_refresh_progress);
- actionBar.addView(indicator);
- }
-
- return actionButton;
- }
-
- /**
- * A {@link android.view.MenuInflater} that reads action bar metadata.
- */
- private class WrappedMenuInflater extends MenuInflater {
- MenuInflater mInflater;
-
- public WrappedMenuInflater(Context context, MenuInflater inflater) {
- super(context);
- mInflater = inflater;
- }
-
- @Override
- public void inflate(int menuRes, Menu menu) {
- loadActionBarMetadata(menuRes);
- mInflater.inflate(menuRes, menu);
- }
-
- /**
- * Loads action bar metadata from a menu resource, storing a list of menu item IDs that
- * should be shown on-screen (i.e. those with showAsAction set to always or ifRoom).
- * @param menuResId
- */
- private void loadActionBarMetadata(int menuResId) {
- XmlResourceParser parser = null;
- try {
- parser = mActivity.getResources().getXml(menuResId);
-
- int eventType = parser.getEventType();
- int itemId;
- int showAsAction;
-
- boolean eof = false;
- while (!eof) {
- switch (eventType) {
- case XmlPullParser.START_TAG:
- if (!parser.getName().equals("item")) {
- break;
- }
-
- itemId = parser.getAttributeResourceValue(MENU_RES_NAMESPACE,
- MENU_ATTR_ID, 0);
- if (itemId == 0) {
- break;
- }
-
- showAsAction = parser.getAttributeIntValue(MENU_RES_NAMESPACE,
- MENU_ATTR_SHOW_AS_ACTION, -1);
- if (showAsAction == MenuItem.SHOW_AS_ACTION_ALWAYS ||
- showAsAction == MenuItem.SHOW_AS_ACTION_IF_ROOM) {
- mActionItemIds.add(itemId);
- }
- break;
-
- case XmlPullParser.END_DOCUMENT:
- eof = true;
- break;
- }
-
- eventType = parser.next();
- }
- } catch (XmlPullParserException e) {
- throw new InflateException("Error inflating menu XML", e);
- } catch (IOException e) {
- throw new InflateException("Error inflating menu XML", e);
- } finally {
- if (parser != null) {
- parser.close();
- }
- }
- }
-
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperHoneycomb.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperHoneycomb.java
deleted file mode 100644
index 16fba69..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperHoneycomb.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-
-/**
- * An extension of {@link ActionBarHelper} that provides Android 3.0-specific functionality for
- * Honeycomb tablets. It thus requires API level 11.
- */
-public class ActionBarHelperHoneycomb extends ActionBarHelper {
- private Menu mOptionsMenu;
- private View mRefreshIndeterminateProgressView = null;
-
- protected ActionBarHelperHoneycomb(Activity activity) {
- super(activity);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- mOptionsMenu = menu;
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public void setRefreshActionItemState(boolean refreshing) {
- // On Honeycomb, we can set the state of the refresh button by giving it a custom
- // action view.
- if (mOptionsMenu == null) {
- return;
- }
-
- final MenuItem refreshItem = mOptionsMenu.findItem(R.id.menu_refresh);
- if (refreshItem != null) {
- if (refreshing) {
- if (mRefreshIndeterminateProgressView == null) {
- LayoutInflater inflater = (LayoutInflater)
- getActionBarThemedContext().getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
- mRefreshIndeterminateProgressView = inflater.inflate(
- R.layout.actionbar_indeterminate_progress, null);
- }
-
- refreshItem.setActionView(mRefreshIndeterminateProgressView);
- } else {
- refreshItem.setActionView(null);
- }
- }
- }
-
- /**
- * Returns a {@link Context} suitable for inflating layouts for the action bar. The
- * implementation for this method in {@link ActionBarHelperICS} asks the action bar for a
- * themed context.
- */
- protected Context getActionBarThemedContext() {
- return mActivity;
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperICS.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperICS.java
deleted file mode 100644
index d2239db..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/ActionBarHelperICS.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuItem;
-
-/**
- * An extension of {@link com.example.android.actionbarcompat.ActionBarHelper} that provides Android
- * 4.0-specific functionality for IceCreamSandwich devices. It thus requires API level 14.
- */
-public class ActionBarHelperICS extends ActionBarHelperHoneycomb {
- protected ActionBarHelperICS(Activity activity) {
- super(activity);
- }
-
- @Override
- protected Context getActionBarThemedContext() {
- return mActivity.getActionBar().getThemedContext();
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/MainActivity.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/MainActivity.java
deleted file mode 100644
index facf1ae..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/MainActivity.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-public class MainActivity extends ActionBarActivity {
- private boolean mAlternateTitle = false;
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- findViewById(R.id.toggle_title).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- if (mAlternateTitle) {
- setTitle(R.string.app_name);
- } else {
- setTitle(R.string.alternate_title);
- }
- mAlternateTitle = !mAlternateTitle;
- }
- });
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater menuInflater = getMenuInflater();
- menuInflater.inflate(R.menu.main, menu);
-
- // Calling super after populating the menu is necessary here to ensure that the
- // action bar helpers have a chance to handle this event.
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- Toast.makeText(this, "Tapped home", Toast.LENGTH_SHORT).show();
- break;
-
- case R.id.menu_refresh:
- Toast.makeText(this, "Fake refreshing...", Toast.LENGTH_SHORT).show();
- getActionBarHelper().setRefreshActionItemState(true);
- getWindow().getDecorView().postDelayed(
- new Runnable() {
- @Override
- public void run() {
- getActionBarHelper().setRefreshActionItemState(false);
- }
- }, 1000);
- break;
-
- case R.id.menu_search:
- Toast.makeText(this, "Tapped search", Toast.LENGTH_SHORT).show();
- break;
-
- case R.id.menu_share:
- Toast.makeText(this, "Tapped share", Toast.LENGTH_SHORT).show();
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/SimpleMenu.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/SimpleMenu.java
deleted file mode 100644
index 8b694d0..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/SimpleMenu.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-
-import java.util.ArrayList;
-
-/**
- * A <em>really</em> dumb implementation of the {@link android.view.Menu} interface, that's only
- * useful for our actionbar-compat purposes. See
- * <code>com.android.internal.view.menu.MenuBuilder</code> in AOSP for a more complete
- * implementation.
- */
-public class SimpleMenu implements Menu {
-
- private Context mContext;
- private Resources mResources;
-
- private ArrayList<SimpleMenuItem> mItems;
-
- public SimpleMenu(Context context) {
- mContext = context;
- mResources = context.getResources();
- mItems = new ArrayList<SimpleMenuItem>();
- }
-
- public Context getContext() {
- return mContext;
- }
-
- public Resources getResources() {
- return mResources;
- }
-
- public MenuItem add(CharSequence title) {
- return addInternal(0, 0, title);
- }
-
- public MenuItem add(int titleRes) {
- return addInternal(0, 0, mResources.getString(titleRes));
- }
-
- public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
- return addInternal(itemId, order, title);
- }
-
- public MenuItem add(int groupId, int itemId, int order, int titleRes) {
- return addInternal(itemId, order, mResources.getString(titleRes));
- }
-
- /**
- * Adds an item to the menu. The other add methods funnel to this.
- */
- private MenuItem addInternal(int itemId, int order, CharSequence title) {
- final SimpleMenuItem item = new SimpleMenuItem(this, itemId, order, title);
- mItems.add(findInsertIndex(mItems, order), item);
- return item;
- }
-
- private static int findInsertIndex(ArrayList<? extends MenuItem> items, int order) {
- for (int i = items.size() - 1; i >= 0; i--) {
- MenuItem item = items.get(i);
- if (item.getOrder() <= order) {
- return i + 1;
- }
- }
-
- return 0;
- }
-
- public int findItemIndex(int id) {
- final int size = size();
-
- for (int i = 0; i < size; i++) {
- SimpleMenuItem item = mItems.get(i);
- if (item.getItemId() == id) {
- return i;
- }
- }
-
- return -1;
- }
-
- public void removeItem(int itemId) {
- removeItemAtInt(findItemIndex(itemId));
- }
-
- private void removeItemAtInt(int index) {
- if ((index < 0) || (index >= mItems.size())) {
- return;
- }
- mItems.remove(index);
- }
-
- public void clear() {
- mItems.clear();
- }
-
- public MenuItem findItem(int id) {
- final int size = size();
- for (int i = 0; i < size; i++) {
- SimpleMenuItem item = mItems.get(i);
- if (item.getItemId() == id) {
- return item;
- }
- }
-
- return null;
- }
-
- public int size() {
- return mItems.size();
- }
-
- public MenuItem getItem(int index) {
- return mItems.get(index);
- }
-
- // Unsupported operations.
-
- public SubMenu addSubMenu(CharSequence charSequence) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public SubMenu addSubMenu(int titleRes) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public int addIntentOptions(int i, int i1, int i2, ComponentName componentName,
- Intent[] intents, Intent intent, int i3, MenuItem[] menuItems) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public void removeGroup(int i) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public void setGroupCheckable(int i, boolean b, boolean b1) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public void setGroupVisible(int i, boolean b) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public void setGroupEnabled(int i, boolean b) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public boolean hasVisibleItems() {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public void close() {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public boolean performShortcut(int i, KeyEvent keyEvent, int i1) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public boolean isShortcutKey(int i, KeyEvent keyEvent) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public boolean performIdentifierAction(int i, int i1) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-
- public void setQwertyMode(boolean b) {
- throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
- }
-}
diff --git a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/SimpleMenuItem.java b/samples/ActionBarCompat/src/com/example/android/actionbarcompat/SimpleMenuItem.java
deleted file mode 100644
index 425ba72..0000000
--- a/samples/ActionBarCompat/src/com/example/android/actionbarcompat/SimpleMenuItem.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.actionbarcompat;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.view.ActionProvider;
-import android.view.ContextMenu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-
-/**
- * A <em>really</em> dumb implementation of the {@link android.view.MenuItem} interface, that's only
- * useful for our actionbar-compat purposes. See
- * <code>com.android.internal.view.menu.MenuItemImpl</code> in AOSP for a more complete
- * implementation.
- */
-public class SimpleMenuItem implements MenuItem {
-
- private SimpleMenu mMenu;
-
- private final int mId;
- private final int mOrder;
- private CharSequence mTitle;
- private CharSequence mTitleCondensed;
- private Drawable mIconDrawable;
- private int mIconResId = 0;
- private boolean mEnabled = true;
-
- public SimpleMenuItem(SimpleMenu menu, int id, int order, CharSequence title) {
- mMenu = menu;
- mId = id;
- mOrder = order;
- mTitle = title;
- }
-
- public int getItemId() {
- return mId;
- }
-
- public int getOrder() {
- return mOrder;
- }
-
- public MenuItem setTitle(CharSequence title) {
- mTitle = title;
- return this;
- }
-
- public MenuItem setTitle(int titleRes) {
- return setTitle(mMenu.getContext().getString(titleRes));
- }
-
- public CharSequence getTitle() {
- return mTitle;
- }
-
- public MenuItem setTitleCondensed(CharSequence title) {
- mTitleCondensed = title;
- return this;
- }
-
- public CharSequence getTitleCondensed() {
- return mTitleCondensed != null ? mTitleCondensed : mTitle;
- }
-
- public MenuItem setIcon(Drawable icon) {
- mIconResId = 0;
- mIconDrawable = icon;
- return this;
- }
-
- public MenuItem setIcon(int iconResId) {
- mIconDrawable = null;
- mIconResId = iconResId;
- return this;
- }
-
- public Drawable getIcon() {
- if (mIconDrawable != null) {
- return mIconDrawable;
- }
-
- if (mIconResId != 0) {
- return mMenu.getResources().getDrawable(mIconResId);
- }
-
- return null;
- }
-
- public MenuItem setEnabled(boolean enabled) {
- mEnabled = enabled;
- return this;
- }
-
- public boolean isEnabled() {
- return mEnabled;
- }
-
- // No-op operations. We use no-ops to allow inflation from menu XML.
-
- public int getGroupId() {
- // Noop
- return 0;
- }
-
- public View getActionView() {
- // Noop
- return null;
- }
-
- public MenuItem setActionProvider(ActionProvider actionProvider) {
- // Noop
- return this;
- }
-
- public ActionProvider getActionProvider() {
- // Noop
- return null;
- }
-
- public boolean expandActionView() {
- // Noop
- return false;
- }
-
- public boolean collapseActionView() {
- // Noop
- return false;
- }
-
- public boolean isActionViewExpanded() {
- // Noop
- return false;
- }
-
- @Override
- public MenuItem setOnActionExpandListener(OnActionExpandListener onActionExpandListener) {
- // Noop
- return this;
- }
-
- public MenuItem setIntent(Intent intent) {
- // Noop
- return this;
- }
-
- public Intent getIntent() {
- // Noop
- return null;
- }
-
- public MenuItem setShortcut(char c, char c1) {
- // Noop
- return this;
- }
-
- public MenuItem setNumericShortcut(char c) {
- // Noop
- return this;
- }
-
- public char getNumericShortcut() {
- // Noop
- return 0;
- }
-
- public MenuItem setAlphabeticShortcut(char c) {
- // Noop
- return this;
- }
-
- public char getAlphabeticShortcut() {
- // Noop
- return 0;
- }
-
- public MenuItem setCheckable(boolean b) {
- // Noop
- return this;
- }
-
- public boolean isCheckable() {
- // Noop
- return false;
- }
-
- public MenuItem setChecked(boolean b) {
- // Noop
- return this;
- }
-
- public boolean isChecked() {
- // Noop
- return false;
- }
-
- public MenuItem setVisible(boolean b) {
- // Noop
- return this;
- }
-
- public boolean isVisible() {
- // Noop
- return true;
- }
-
- public boolean hasSubMenu() {
- // Noop
- return false;
- }
-
- public SubMenu getSubMenu() {
- // Noop
- return null;
- }
-
- public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener onMenuItemClickListener) {
- // Noop
- return this;
- }
-
- public ContextMenu.ContextMenuInfo getMenuInfo() {
- // Noop
- return null;
- }
-
- public void setShowAsAction(int i) {
- // Noop
- }
-
- public MenuItem setShowAsActionFlags(int i) {
- // Noop
- return null;
- }
-
- public MenuItem setActionView(View view) {
- // Noop
- return this;
- }
-
- public MenuItem setActionView(int i) {
- // Noop
- return this;
- }
-}
diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index b74e290..4cd7666 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1176,7 +1176,6 @@
</intent-filter>
</activity>
- <!--
<activity android:name=".content.TextUndoActivity" android:label="@string/activity_text_undo">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1184,7 +1183,6 @@
<category android:name="android.intent.category.EMBED" />
</intent-filter>
</activity>
- -->
<activity android:name=".content.ResourcesLayoutReference"
android:label="@string/activity_resources_layout_reference">
diff --git a/samples/ApiDemos/res/anim/animator.xml b/samples/ApiDemos/res/anim/animator.xml
index 2432f19..67aca3f 100644
--- a/samples/ApiDemos/res/anim/animator.xml
+++ b/samples/ApiDemos/res/anim/animator.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
+<!-- BEGIN_INCLUDE(ValueAnimatorResources) -->
<animator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="1000"
android:valueFrom="1"
@@ -21,3 +22,4 @@
android:valueType="floatType"
android:repeatCount="1"
android:repeatMode="reverse"/>
+<!-- END_INCLUDE(ValueAnimatorResources) -->
diff --git a/samples/ApiDemos/res/anim/object_animator.xml b/samples/ApiDemos/res/anim/object_animator.xml
index 863d423..dc503d2 100644
--- a/samples/ApiDemos/res/anim/object_animator.xml
+++ b/samples/ApiDemos/res/anim/object_animator.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
+<!-- BEGIN_INCLUDE(ObjectAnimatorResources) -->
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="1000"
android:valueTo="200"
@@ -21,3 +22,4 @@
android:propertyName="y"
android:repeatCount="1"
android:repeatMode="reverse"/>
+<!-- END_INCLUDE(ObjectAnimatorResources) -->
diff --git a/samples/ApiDemos/res/anim/object_animator_pvh.xml b/samples/ApiDemos/res/anim/object_animator_pvh.xml
new file mode 100644
index 0000000..10c4e4d
--- /dev/null
+++ b/samples/ApiDemos/res/anim/object_animator_pvh.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- BEGIN_INCLUDE(PropertyValuesHolderResources) -->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="1000"
+ android:repeatCount="1"
+ android:repeatMode="reverse">
+ <propertyValuesHolder android:propertyName="x" android:valueTo="400"/>
+ <propertyValuesHolder android:propertyName="y" android:valueTo="200"/>
+</objectAnimator>
+<!-- END_INCLUDE(PropertyValuesHolderResources) -->
diff --git a/samples/ApiDemos/res/anim/object_animator_pvh_kf.xml b/samples/ApiDemos/res/anim/object_animator_pvh_kf.xml
new file mode 100644
index 0000000..859a508
--- /dev/null
+++ b/samples/ApiDemos/res/anim/object_animator_pvh_kf.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="1000"
+ android:repeatCount="1"
+ android:repeatMode="reverse">
+ <!-- BEGIN_INCLUDE(KeyframeResources) -->
+ <propertyValuesHolder android:propertyName="x" >
+ <keyframe android:fraction="0" android:value="800" />
+ <keyframe android:fraction=".2" android:value="1000" />
+ <keyframe android:fraction="1" android:value="400" />
+ </propertyValuesHolder>
+ <propertyValuesHolder android:propertyName="y" >
+ <keyframe/>
+ <keyframe android:value="300" />
+ <keyframe android:value="1000" />
+ </propertyValuesHolder>
+ <!-- END_INCLUDE(KeyframeResources) -->
+</objectAnimator>
diff --git a/samples/ApiDemos/res/anim/value_animator_pvh_kf.xml b/samples/ApiDemos/res/anim/value_animator_pvh_kf.xml
new file mode 100644
index 0000000..86b2e17
--- /dev/null
+++ b/samples/ApiDemos/res/anim/value_animator_pvh_kf.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- BEGIN_INCLUDE(ValueAnimatorKeyframeResources) -->
+<animator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="1000"
+ android:repeatCount="1"
+ android:repeatMode="reverse">
+ <propertyValuesHolder>
+ <keyframe android:fraction="0" android:value="1"/>
+ <keyframe android:fraction=".2" android:value=".4"/>
+ <keyframe android:fraction="1" android:value="0"/>
+ </propertyValuesHolder>
+</animator>
+<!-- END_INCLUDE(ValueAnimatorKeyframeResources) -->
diff --git a/samples/ApiDemos/res/layout/text_undo.xml b/samples/ApiDemos/res/layout/text_undo.xml
index f7d74e8..cf4ac6c 100644
--- a/samples/ApiDemos/res/layout/text_undo.xml
+++ b/samples/ApiDemos/res/layout/text_undo.xml
@@ -14,21 +14,20 @@
limitations under the License.
-->
-<!-- Demonstrates saving and restoring activity state.
- See corresponding Java code com.android.sdk.app.SaveRestoreState.java. -->
+<!-- Demonstrates undo/redo behavior on a text field. -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">
<LinearLayout android:orientation="vertical" android:padding="4dip"
android:layout_width="match_parent" android:layout_height="wrap_content">
- <TextView android:id="@+id/msg"
+ <TextView android:id="@+id/default_edit_msg"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0" android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingBottom="8dip"
- android:text="@string/text_undo_msg" />
+ android:text="@string/text_undo_default_edit_msg" />
- <EditText android:id="@+id/text"
+ <EditText android:id="@+id/default_text"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -41,18 +40,73 @@
android:layout_height="match_parent"
android:paddingTop="8dip">
<Button
- android:id="@+id/undo"
+ android:id="@+id/set_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/undo"
+ android:text="@string/text_undo_set_text"
+ android:layout_gravity="bottom" />
+ <Button
+ android:id="@+id/append_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_undo_append_text"
android:layout_gravity="bottom" />
<Button
- android:id="@+id/redo"
+ android:id="@+id/insert_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/redo"
+ android:text="@string/text_undo_insert_text"
android:layout_gravity="bottom" />
</LinearLayout>
+ <TextView android:id="@+id/undo_disabled_msg"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:paddingBottom="8dip"
+ android:text="@string/text_undo_undo_disabled_msg" />
+
+ <EditText android:id="@+id/undo_disabled_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:freezesText="true"
+ android:allowUndo="false">
+ </EditText>
+
+ <TextView android:id="@+id/length_limit_msg"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:paddingBottom="8dip"
+ android:text="@string/text_undo_length_limit_msg" />
+
+ <EditText android:id="@+id/length_limit_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:freezesText="true">
+ </EditText>
+
+ <TextView android:id="@+id/credit_card_msg"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:paddingBottom="8dip"
+ android:text="@string/text_undo_credit_card_msg" />
+
+ <EditText android:id="@+id/credit_card_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:freezesText="true">
+ </EditText>
+
</LinearLayout>
</ScrollView>
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 65bfba3..8b42970 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -421,11 +421,14 @@
<string name="styled_text">Plain, <b>bold</b>, <i>italic</i>, <b><i>bold-italic</i></b></string>
<string name="styled_text_prog">Assigned programmatically:</string>
- <string name="activity_text_undo">Content/Undo Manager/Text</string>
- <string name="text_undo_msg">Demonstrates simple use of UndoManager with text editing
- in a TextView.</string>
- <string name="undo">Undo</string>
- <string name="redo">Redo</string>
+ <string name="activity_text_undo">Content/Undo</string>
+ <string name="text_undo_default_edit_msg">TextView with the default Control-Z undo behavior.</string>
+ <string name="text_undo_set_text">SetText</string>
+ <string name="text_undo_append_text">Append</string>
+ <string name="text_undo_insert_text">Insert</string>
+ <string name="text_undo_undo_disabled_msg">TextView with undo disabled.</string>
+ <string name="text_undo_length_limit_msg">TextView with a length limit InputFilter.</string>
+ <string name="text_undo_credit_card_msg">Credit card input field with a TextWatcher.</string>
<string name="activity_resources_layout_reference">Content/Resources/Layout Reference</string>
<string name="resources_layout_reference_description">Shows how to write layout
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java b/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
index 910ee28..bac4f92 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
@@ -78,6 +78,9 @@
addBall(200, 50);
addBall(350, 50);
addBall(500, 50, Color.GREEN);
+ addBall(650, 50);
+ addBall(800, 50);
+ addBall(950, 50);
}
private void createAnimation() {
@@ -106,8 +109,27 @@
loadAnimator(appContext, R.anim.color_animator);
colorizer.setTarget(balls.get(3));
+ ObjectAnimator animPvh = (ObjectAnimator) AnimatorInflater.
+ loadAnimator(appContext, R.anim.object_animator_pvh);
+ animPvh.setTarget(balls.get(4));
+
+
+ ObjectAnimator animPvhKf = (ObjectAnimator) AnimatorInflater.
+ loadAnimator(appContext, R.anim.object_animator_pvh_kf);
+ animPvhKf.setTarget(balls.get(5));
+
+ ValueAnimator faderKf = (ValueAnimator) AnimatorInflater.
+ loadAnimator(appContext, R.anim.value_animator_pvh_kf);
+ faderKf.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ public void onAnimationUpdate(ValueAnimator animation) {
+ balls.get(6).setAlpha((Float) animation.getAnimatedValue());
+ }
+ });
+
animation = new AnimatorSet();
- ((AnimatorSet) animation).playTogether(anim, fader, seq, colorizer);
+ ((AnimatorSet) animation).playTogether(anim, fader, seq, colorizer, animPvh,
+ animPvhKf, faderKf);
+
}
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
index 15fbdc1..71badcd 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
@@ -406,8 +406,7 @@
if (featureString != null) {
PersistableBundle bundle = new PersistableBundle();
bundle.putStringArray("features", featureString.split(","));
- Log.w(TAG, "setTrustAgentConfigurat() is disabled");
- // mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
+ mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
}
} else {
Log.w(TAG, "Invalid component: " + component);
diff --git a/samples/ApiDemos/src/com/example/android/apis/content/TextUndoActivity.java b/samples/ApiDemos/src/com/example/android/apis/content/TextUndoActivity.java
index 6b9dc8e..d782d31 100644
--- a/samples/ApiDemos/src/com/example/android/apis/content/TextUndoActivity.java
+++ b/samples/ApiDemos/src/com/example/android/apis/content/TextUndoActivity.java
@@ -16,58 +16,123 @@
package com.example.android.apis.content;
-import android.app.Activity;
-//import android.content.UndoManager;
-import android.os.Parcelable;
-import android.view.View;
-import android.widget.Button;
import com.example.android.apis.R;
+import android.app.Activity;
import android.os.Bundle;
-import android.widget.TextView;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.text.TextWatcher;
+import android.text.method.DigitsKeyListener;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
/**
* Simple example of using an UndoManager for editing text in a TextView.
*/
public class TextUndoActivity extends Activity {
- //UndoManager mUndoManager;
+ // Characters allowed as input in the credit card field.
+ private static final String CREDIT_CARD_CHARS = "0123456789 ";
+
+ EditText mDefaultText;
+ EditText mLengthLimitText;
+ EditText mCreditCardText;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- /*
- mUndoManager = new UndoManager();
- if (savedInstanceState != null) {
- Parcelable p = savedInstanceState.getParcelable("undo");
- if (p != null) {
- mUndoManager.restoreInstanceState(p);
- }
- }
- */
-
setContentView(R.layout.text_undo);
- /*
- ((TextView)findViewById(R.id.text)).setUndoManager(mUndoManager, "text");
- ((Button)findViewById(R.id.undo)).setOnClickListener(new View.OnClickListener() {
+ mDefaultText = (EditText) findViewById(R.id.default_text);
+ ((Button) findViewById(R.id.set_text)).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- mUndoManager.undo(null, 1);
+ mDefaultText.setText("some text");
}
});
- ((Button)findViewById(R.id.redo)).setOnClickListener(new View.OnClickListener() {
+ ((Button) findViewById(R.id.append_text)).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- mUndoManager.redo(null, 1);
+ mDefaultText.append(" append");
}
});
- */
+ ((Button) findViewById(R.id.insert_text)).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Editable editable = mDefaultText.getText();
+ editable.insert(0, "insert ");
+ }
+ });
+
+ mLengthLimitText = (EditText) findViewById(R.id.length_limit_text);
+ mLengthLimitText.setFilters(new InputFilter[] { new InputFilter.LengthFilter(4) });
+
+ mCreditCardText = (EditText) findViewById(R.id.credit_card_text);
+ mCreditCardText.setKeyListener(DigitsKeyListener.getInstance(CREDIT_CARD_CHARS));
+ mCreditCardText.addTextChangedListener(new CreditCardTextWatcher());
}
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- //outState.putParcelable("undo", mUndoManager.saveInstanceState());
+ /**
+ * A simple credit card input formatter that adds spaces every 4 characters.
+ */
+ private static class CreditCardTextWatcher implements TextWatcher {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ String original = s.toString();
+ String formatted = addSpaces(getNumbers(original));
+ // This is an ugly way to avoid infinite recursion, but it's common in app code.
+ if (!formatted.equals(original)) {
+ s.replace(0, s.length(), formatted);
+ }
+ }
+
+ /**
+ * @return Returns a string with a space added every 4 characters.
+ */
+ private static String addSpaces(CharSequence str) {
+ StringBuilder builder = new StringBuilder();
+ int len = str.length();
+ for (int i = 0; i < len; i += 4) {
+ if (i + 4 < len) {
+ builder.append(str.subSequence(i, i + 4));
+ builder.append(' ');
+ } else {
+ // Don't put a space after the end.
+ builder.append(str.subSequence(i, len));
+ }
+ }
+ return builder.toString();
+ }
+
+ /**
+ * @return Returns a string containing only the digits from a character sequence.
+ */
+ private static String getNumbers(CharSequence cc) {
+ StringBuilder sb = new StringBuilder(16);
+ for (int i = 0, count = cc.length(); i < count; ++i) {
+ char c = cc.charAt(i);
+ if (isNumber(c)) {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
+
+ private static boolean isNumber(char c) {
+ return c >= '0' && c <= '9';
+ }
+
}
}
diff --git a/samples/SampleSyncAdapter/Android.mk b/samples/SampleSyncAdapter/Android.mk
index eec507b..3861a95 100644
--- a/samples/SampleSyncAdapter/Android.mk
+++ b/samples/SampleSyncAdapter/Android.mk
@@ -8,7 +8,7 @@
LOCAL_PACKAGE_NAME := SampleSyncAdapter
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 15
include $(BUILD_PACKAGE)
diff --git a/samples/Wiktionary/Android.mk b/samples/Wiktionary/Android.mk
index d6ce1f1..0d015fd 100644
--- a/samples/Wiktionary/Android.mk
+++ b/samples/Wiktionary/Android.mk
@@ -8,7 +8,7 @@
LOCAL_PACKAGE_NAME := Wiktionary
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 8
include $(BUILD_PACKAGE)
diff --git a/samples/WiktionarySimple/Android.mk b/samples/WiktionarySimple/Android.mk
index a5a1423..670cd82 100644
--- a/samples/WiktionarySimple/Android.mk
+++ b/samples/WiktionarySimple/Android.mk
@@ -8,7 +8,7 @@
LOCAL_PACKAGE_NAME := WiktionarySimple
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 8
include $(BUILD_PACKAGE)
diff --git a/samples/XmlAdapters/Android.mk b/samples/XmlAdapters/Android.mk
index e12ce57..6c46e19 100644
--- a/samples/XmlAdapters/Android.mk
+++ b/samples/XmlAdapters/Android.mk
@@ -10,7 +10,7 @@
LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 8
include $(BUILD_PACKAGE)
diff --git a/samples/samples_source.prop_template b/samples/samples_source.prop_template
index 1524e33..d3cdfd5 100644
--- a/samples/samples_source.prop_template
+++ b/samples/samples_source.prop_template
@@ -1,4 +1,4 @@
Pkg.UserSrc=false
-Pkg.Revision=5
+Pkg.Revision=1
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 0eb8dd2..ccaa597 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -1,10 +1,10 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false
Platform.Version=${PLATFORM_VERSION}
-Platform.CodeName=LOLLIPOP_MR1
-Pkg.Revision=2
+Platform.CodeName=LOLLIPOP
+Pkg.Revision=1
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
-Layoutlib.Api=14
-Layoutlib.Revision=2
+Layoutlib.Api=13
+Layoutlib.Revision=1
Platform.MinToolsRev=22
diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index dc43a93..fdbcb78 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -51,7 +51,7 @@
"""Direct all future commands to Android target with the given serial."""
self._target_arg = "-s %s" % serial
- def SendCommand(self, command_string, timeout_time=20, retry_count=3):
+ def SendCommand(self, command_string, timeout_time=60, retry_count=3):
"""Send a command via adb.
Args:
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 19cba74..4d9ee5f 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -554,6 +554,11 @@
build_path="external/android-clat"
description="clatd unit tests." />
+<!-- dhcpcd -->
+<test-native name="dhcpcd"
+ build_path="external/dhcpcd"
+ description="dhcpcd unit tests." />
+
<!-- Libjingle -->
<test-native name="libjingle"
build_path="vendor/google/libraries/libjingle"
diff --git a/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java
index 2e18cc4..6b99ea5 100644
--- a/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java
+++ b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java
@@ -21,7 +21,7 @@
import android.database.Cursor;
import android.os.Bundle;
import android.os.HandlerThread;
-import android.support.test.InjectContext;
+import android.support.test.InstrumentationRegistry;
import org.junit.Assert;
import static junit.framework.Assert.assertEquals;
@@ -42,8 +42,6 @@
public final static String BODY = "test sms";
private final static int SMS_POLL_TIME_MS = 10 * 1000;
private final static int SIXY_SECONDS_OF_LOOPS = 6;
- @InjectContext
- public Context mContext;
/**
* Verify that an SMS has been received with the correct number and body
@@ -63,7 +61,7 @@
}
private Cursor getSmsCursor() throws java.lang.InterruptedException {
- ContentResolver r = mContext.getContentResolver();
+ ContentResolver r = InstrumentationRegistry.getTargetContext().getContentResolver();
Uri message = Uri.parse("content://sms/");
Cursor c;
diff --git a/tools/idegen/src/Configuration.java b/tools/idegen/src/Configuration.java
index c09be1a..bd643b9 100644
--- a/tools/idegen/src/Configuration.java
+++ b/tools/idegen/src/Configuration.java
@@ -123,16 +123,27 @@
*/
boolean firstJavaFile = true;
- File[] files = directory.listFiles();
- if (files == null) {
- return;
- }
+ File[] files = directory.listFiles();
+ if (files == null) {
+ return;
+ }
for (File file : files) {
// Trim preceding "./" from path.
String path = file.getPath().substring(2);
- // Keep track of source roots for .java files.
- if (path.endsWith(".java") && !file.isDirectory()) {
+ if (file.isDirectory()) {
+ // Traverse nested directories.
+ if (excludes.exclude(path)) {
+ // Don't recurse into excluded dirs.
+ Log.debug("Excluding: " + path);
+ excludedDirs.add(file);
+ } else {
+ traverse(file, sourceRoots, jarFiles, excludedDirs,
+ excludes);
+ }
+ } else if (path.endsWith(".java")) {
+ // Keep track of source roots for .java files.
+ // Do not check excludes in this branch.
if (firstJavaFile) {
// Only parse one .java file per directory.
firstJavaFile = false;
@@ -142,30 +153,12 @@
sourceRoots.add(sourceRoot);
}
}
-
- continue;
- }
-
- // Keep track of .jar files.
- if (path.endsWith(".jar")) {
- if (!excludes.exclude(path)) {
- jarFiles.add(file);
- } else {
- Log.debug("Skipped: " + file);
- }
-
- continue;
- }
-
- // Traverse nested directories.
- if (file.isDirectory()) {
+ } else if (path.endsWith(".jar")) {
+ // Keep track of .jar files.
if (excludes.exclude(path)) {
- // Don't recurse into excluded dirs.
- Log.debug("Excluding: " + path);
- excludedDirs.add(file);
+ Log.debug("Skipped: " + file);
} else {
- traverse(file, sourceRoots, jarFiles, excludedDirs,
- excludes);
+ jarFiles.add(file);
}
}
}
diff --git a/tools/recovery_l10n/res/values-sk/strings.xml b/tools/recovery_l10n/res/values-sk/strings.xml
index e55f83f..cae6bce 100644
--- a/tools/recovery_l10n/res/values-sk/strings.xml
+++ b/tools/recovery_l10n/res/values-sk/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="recovery_installing" msgid="7864047928003865598">"Prebieha inštalácia aktualizácie systému..."</string>
+ <string name="recovery_installing" msgid="7864047928003865598">"Inštalácia aktualizácie systému..."</string>
<string name="recovery_erasing" msgid="4612809744968710197">"Prebieha mazanie..."</string>
<string name="recovery_no_command" msgid="1915703879031023455">"Žiadny príkaz."</string>
<string name="recovery_error" msgid="4550265746256727080">"Chyba!"</string>
