LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "fix android beam icon and add make file" into ics-mr0

Browse Source
This commit is contained in:
Scott Main
2011-10-14 14:04:02 -07:00
committed by Android (Google) Code Review
parent 6a6335f4fd 936304c95f
commit f21a3e2847
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/AndroidBeamDemo/Android.mk Normal file
View File

@@ -0,0 +1,15 @@
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 := AndroidBeamdemo
LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)

2
samples/AndroidBeamDemo/AndroidManifest.xml
View File

@@ -24,7 +24,7 @@
<uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.NFC" />
<uses-sdk android:minSdkVersion="14" /> <uses-sdk android:minSdkVersion="14" />
<uses-feature android:name="android.hardware.nfc" /> <uses-feature android:name="android.hardware.nfc" />
<application android:icon="@drawable/icon" android:label="@string/app_name"> <application android:icon="@drawable/ic_launcher" android:label="@string/app_name">
<activity android:name="com.example.android.beam.Beam" <activity android:name="com.example.android.beam.Beam"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop"> android:launchMode="singleTop">

14
samples/ApiDemos/_index.html
View File

@@ -20,17 +20,17 @@ that illustrate the use of various Android APIs. It includes samples of:
<p><strong>Update:</strong> The following are some of the new demos for Android 4.0:</p> <p><strong>Update:</strong> The following are some of the new demos for Android 4.0:</p>
<ul> <ul>
<li><a <li><a
href="src/com/example/android/apis/preference/PreferencesFromCode.java">SwitchPreference</a></li> href="src/com/example/android/apis/preference/PreferencesFromCode.html">SwitchPreference</a></li>
<li><a <li><a
href="src/com/example/android/apis/app/ActionBarActionProviderActivity.java">ShareActionProvider href="src/com/example/android/apis/app/ActionBarActionProviderActivity.html">ShareActionProvider
</a></li> </a></li>
<li><a href="src/com/example/android/apis/view/SearchViewActionBar.java">Collapsible action <li><a href="src/com/example/android/apis/view/SearchViewActionBar.html">Collapsible action
view</a></li> view</a></li>
<li><a href="src/com/example/android/apis/app/FragmentCustomAnimations.java">Custom <li><a href="src/com/example/android/apis/app/FragmentCustomAnimations.html">Custom
fragment animations</a></li> fragment animations</a></li>
<li><a href="src/com/example/android/apis/app/RemoteService.java">Service bindings</a></li> <li><a href="src/com/example/android/apis/app/RemoteService.html">Service bindings</a></li>
<li><a href="src/com/example/android/apis/view/OverscanActivity.java">Full screen UI modes</a></li> <li><a href="src/com/example/android/apis/view/OverscanActivity.html">Full screen UI modes</a></li>
<a><a href="src/com/example/android/apis/graphics/TouchPaint.java">Stylus and hover <li><a href="src/com/example/android/apis/graphics/TouchPaint.html">Stylus and hover
support</a></li> support</a></li>
<li><a href="src/com/example/android/apis/view/Switches.html">Switch widget</a></li> <li><a href="src/com/example/android/apis/view/Switches.html">Switch widget</a></li>
</ul> </ul>