Merge change 8564 into donut (11b6a29d) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ web_docs_sample_code_flags := \
		# most current Android platform version included in the SDK package.
		framework_docs_SDK_VERSION := 1.5
		# release version for SDK (ie "Release x")
		framework_docs_SDK_REL_ID := 2
		framework_docs_SDK_REL_ID := 3
		framework_docs_SDK_CURRENT_DIR := $(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)

		framework_docs_LOCAL_DROIDDOC_OPTIONS += \

docs/html/guide/topics/appwidgets/index.jd

+14 −2

Original line number	Diff line number	Diff line
		@@ -150,14 +150,26 @@ folder.</p>
		<code>(number of cells * 74) - 2</code><br/>
		Following this formula, you should use 72 dp for a height of one cell, 294 dp and for a width of four cells.</p>
		</li>
		<li>The <code>updatePerdiodMillis</code> attribute defines how often the App Widget framework should
		<li>The <code>updatePeriodMillis</code> attribute defines how often the App Widget framework should
		request an update from the {@link android.appwidget.AppWidgetProvider} by calling the
		{@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[])
		onUpdate()} method. The actual update is not guaranteed to occur exactly on time with this value
		and we suggest updating as infrequently as possible—perhaps no more than once an hour to
		conserve the battery. You might also allow the user to adjust the frequency in a
		configuration—some people might want a stock ticker to update every 15 minutes, or maybe
		only four times a day.</li>
		only four times a day.
		<p class="note"><strong>Note:</strong> If the device is asleep when it is time for an update
		(as defined by <code>updatePeriodMillis</code>), then the device will wake up in order
		to perform the update. If you don't update more than once per hour, this probably won't
		cause significant problems for the battery life. If, however, you need to update more
		frequently and/or you do not need to update while the device is asleep, then you can instead
		perform updates based on an alarm that will not wake the device. To do so, set an alarm with
		an Intent that your AppWidgetProvider receives, using the {@link android.app.AlarmManager}.
		Set the alarm type to either {@link android.app.AlarmManager#ELAPSED_REALTIME} or
		{@link android.app.AlarmManager#RTC}, which will only
		deliver the alarm when the device is awake. Then set <code>updatePeriodMillis</code> to
		zero (<code>"0"</code>).</p>
		</li>
		<li>The <code>initialLayout</code> attribute points to the layout resource that defines the
		App Widget layout.</li>
		<li>The <code>configure</code> attribute defines the {@link android.app.Activity} to launch when

docs/html/index.jd

+24 −17

Original line number	Diff line number	Diff line
		@@ -11,21 +11,19 @@ home=true
		</div><!-- end homeTitle -->
		<div id="announcement-block">
		<!-- total max width is 520px -->
		<img src="/assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
		<div id="announcement" style="width:270px">
		<p>The Google I/O developer conference took place May 27-28 in San Francisco.
		If you missed the conference, you can experience the Android sessions
		by viewing YouTube videos and presentation slides.</p>
		<p><a href="http://code.google.com/events/io/sessions.html#mobile">See the Mobile sessions at Google I/O »</a></p>
		<img src="/assets/images/home/android_adc.png" alt="Android Developer Challenge 2" width="232px" />
		<div id="announcement" style="width:275px">
		<p>The second Android Developer Challenge has begun! In this contest,
		real-world users will help review and score applications and the overall winner will
		take away $250,000. The deadline for submitting an application to the contest is August 31, 2009.</p>
		<p><a href="http://code.google.com/android/adc/">Learn more about ADC 2 »</a></p>
		</div> <!-- end annoucement -->
		</div> <!-- end annoucement-block -->
		</div><!-- end topAnnouncement -->
		<div id="carousel">
		<div id="carouselMain">
		<div id="bulletinImg"></div>
		<div id="bulletinDesc"></div>
		<div id="carouselMain" style="height:192px"> <!-- this height can be adjusted based on the content height -->
		</div>
		<div class="clearer"></div>
		<div id="carouselWheel">
		<div class="app-list-container" align="center">
		<a href="javascript:{}" id="arrow-left" onclick="" class="arrow-left-off"></a>
		<div id="list-clip">
		@@ -33,10 +31,10 @@ home=true
		<!-- populated by buildCarousel() -->
		</div>
		</div><!-- end list-clip -->
		<a href="javascript:page_right()" id="arrow-right" onclick="" class="arrow-right-off"></a>
		<a href="javascript:{ page_right(); }" id="arrow-right" onclick="" class="arrow-right-on"></a>
		<div class="clearer"></div>
		</div><!-- end app-list container -->
		</div><!-- end carousel -->
		</div><!-- end carouselWheel -->
		</div><!-- end homeMiddle -->

		<div style="clear:both"> </div>
		@@ -81,8 +79,8 @@ home=true
		<td class="imageCell"><a href="http://www.youtube.com/user/androiddevelopers"><img src="{@docRoot}assets/images/video-droid.png" style="padding:0" /></a></td>
		<td>
		<h2 class="green">Watch</h2>
		<object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
		<p style="margin-top:1em"><a href="http://www.youtube.com/user/androiddevelopers">More Android videos »</a></p>
		<object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
		<p style="margin-top:1em"><a href="{@docRoot}videos/index.html">More Android videos »</a></p>
		</td>
		</tr>

		@@ -122,10 +120,19 @@ home=true
		'sdk': {
		'layout':"imgLeft",
		'icon':"sdk-small.png",
		'name':"SDK 1.5 r2",
		'name':"SDK 1.5 r3",
		'img':"sdk-large.png",
		'title':"Android 1.5 SDK",
		'desc': "<p>Android 1.5 SDK is now available. It includes new APIs for Android 1.5, updated developer tools, multiple platform versions, and a Google APIs add-on.</p><p><a href='{@docRoot}sdk/1.5_r2/index.html'>Download Android 1.5 SDK</a></p>"
		'desc': "<p>Android 1.5 SDK is now available. It includes new APIs for Android 1.5, updated developer tools, multiple platform versions, and a Google APIs add-on.</p><p><a href='{@docRoot}sdk/1.5_r3/index.html'>Download Android 1.5 SDK »</a></p>"
		},

		'io': {
		'layout':"imgLeft",
		'icon':"io-small.png",
		'name':"Google I/O",
		'img':"io-large.png",
		'title':"Google I/O Developer Conference",
		'desc': "<p>The Google I/O developer conference took place May 27-28 in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O »</a></p>"
		},

		'mapskey': {

docs/html/intl/ja/index.jd

+23 −16

Original line number	Diff line number	Diff line
		@@ -11,19 +11,17 @@ home=true
		</div><!-- end homeTitle -->
		<div id="announcement-block">
		<!-- total max width is 520px -->
		<img src="/assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
		<div id="announcement" style="width:270px">
		<p>Google I/O は、サンフランシスコの Moscone Center で 5 月 27～28 日に開催された開発者会議です。このイベントに参加できなかった方は、各アンドロイド向けセッションを、YouTube ビデオやプレゼンテーションのスライド資料で体験する事が可能です。</p>
		<p><a href="http://code.google.com/events/io/sessions.html#mobile">Mobile のセッションを参照してください »</a></p>
		<img src="/assets/images/home/android_adc.png" alt="Android Developer Challenge 2" width="232px" />
		<div id="announcement" style="width:275px">
		<p>第2Android Developer Challengeが、遂に登場しました！このアプリケーション開発コンテストでは、Androidのユーザなら誰でも簡単に参加でき、一等の賞金は$250,000 です。登録の締切日は8月31日になります。</p>
		<p><a href="http://code.google.com/android/adc/">Android Developer Challengeについて詳しくはこちら »</a></p>
		</div> <!-- end annoucement -->
		</div> <!-- end annoucement-block -->
		</div><!-- end topAnnouncement -->
		<div id="carousel">
		<div id="carouselMain">
		<div id="bulletinImg"></div>
		<div id="bulletinDesc"></div>
		<div id="carouselMain" style="height:210px"> <!-- this height can be adjusted based on the content height -->
		</div>
		<div class="clearer"></div>
		<div id="carouselWheel">
		<div class="app-list-container" align="center">
		<a href="javascript:{}" id="arrow-left" onclick="" class="arrow-left-off"></a>
		<div id="list-clip">
		@@ -31,10 +29,10 @@ home=true
		<!-- populated by buildCarousel() -->
		</div>
		</div><!-- end list-clip -->
		<a href="javascript:page_right()" id="arrow-right" onclick="" class="arrow-right-off"></a>
		<a href="javascript:{ page_right(); }" id="arrow-right" onclick="" class="arrow-right-on"></a>
		<div class="clearer"></div>
		</div><!-- end app-list container -->
		</div><!-- end carousel -->
		</div><!-- end carouselWheel -->
		</div><!-- end homeMiddle -->

		<div style="clear:both"> </div>
		@@ -79,8 +77,8 @@ home=true
		<td class="imageCell"><a href="http://www.youtube.com/user/androiddevelopers"><img src="{@docRoot}assets/images/video-droid.png" style="padding:0" /></a></td>
		<td>
		<h2 class="green">再生</h2>
		<object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=ja&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=ja&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
		<p style="margin-top:1em"><a href="http://www.youtube.com/user/androiddevelopers">その他の Android 動画 »</a></p>
		<object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
		<p style="margin-top:1em"><a href="{@docRoot}videos/index.html">その他の Android 動画 »</a></p>
		</td>
		</tr>

		@@ -120,10 +118,19 @@ home=true
		'sdk': {
		'layout':"imgLeft",
		'icon':"sdk-small.png",
		'name':"SDK 1.5 r2",
		'name':"SDK 1.5 r3",
		'img':"sdk-large.png",
		'title':"Android 1.5 SDK r2",
		'desc': "<p>Android 1.5 SDK の最新バージョンが公開されました。このリリースには Android 1.5 用の API、最新版デベロッパーツール、複数プラットフォーム(バージョン)サポート、そして Google API のアドオンが含まれています。</p><p><a href='{@docRoot}sdk/1.5_r2/index.html'>Android 1.5 SDK をダウンロード</a></p>"
		'title':"Android 1.5 SDK",
		'desc': "<p>Android 1.5 SDK の最新バージョンが公開されました。このリリースには Android 1.5 用の API、最新版デベロッパーツール、複数プラットフォーム(バージョン)サポート、そして Google API のアドオンが含まれています。</p><p><a href='{@docRoot}sdk/1.5_r3/index.html'>Android 1.5 SDK をダウンロード »</a></p>"
		},

		'io': {
		'layout':"imgLeft",
		'icon':"io-small.png",
		'name':"Google I/O",
		'img':"io-large.png",
		'title':"Google I/O Developer Conference",
		'desc': "<p>Google I/O は、サンフランシスコの Moscone Center で 5 月 27～28 日に開催された開発者会議です。このイベントに参加できなかった方は、各アンドロイド向けセッションを、YouTube ビデオ資料で体験する事が可能<nobr>です</nobr>。</p><p><a href='{@docRoot}videos/index.html'>セッションを参照してください »</a></p>"
		},

		'mapskey': {

docs/html/sdk/RELEASENOTES.jd

+70 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,76 @@ page.title=SDK Release Notes
		releases. For the latest known issues, please ensure that you're viewing this
		page at <a href="http://developer.android.com/sdk/RELEASENOTES.html">http://developer.android.com/sdk/RELEASENOTES.html</a>.</p>

		<h2 id="1.5_r3">Android 1.5 SDK, Release 3</h2>

		<p>Provides an updated Android 1.5 system image that includes permissions
		fixes, as described below, and a new application — an IME for Japanese
		text input. Also provides the same set of developer tools included in the
		previous SDK, but with bug fixes and several new features.</p>

		<h3>Permissions Fixes</h3>

		<p>The latest version of the Android platform, deployable to
		Android-powered devices, includes fixes to the permissions-checking
		in certain areas of the framework. Specifically, the Android system
		now properly checks and enforces several existing permissions where it
		did not do so in the previous release. Because of these changes in
		enforcement, you are strongly encouraged to test your application
		against the new Android 1.5 system image included in this SDK, to ensure
		that it functions normally. </p>

		<p>In particular, if your application uses any of the system areas listed below,
		you should add the required permissions to the application's manifest and then
		test the areas of your code that depend on the permission-protected services.
		Even if you believe your application does not use the permissions-protected
		services, you should compile and test your application under the latest platform
		version to ensure that users will not encounter problems when using your
		application. </p>

		<p>The changes to permissions are as follows:</p>

		<ul>
		<li>When an application requests access to device camera (through
		android.hardware.camera), the <code>CAMERA</code> permission check is now
		properly enforced. </li>
		<li>When an application requests access to device audio capture (through
		android.media.MediaRecorder), the <code>RECORD_AUDIO</code> permission check is
		now properly enforced.</li>
		</ul>

		<p>For more information, see the issue described in the oCert advisory
		below:</p>

		<p style="margin-left: 2em;"><a href="http://www.ocert.org/advisories/ocert-2009-011.html">http://www.ocert.org/advisories/ocert-2009-011.html</a> </p>

		<h3>Resolved Issues, Changes</h3>

		<ul>
		<li>The SDK includes a new version of the Google APIs add-on. The add-on
		provides an updated com.google.android.maps external library that fixes compile
		errors related to certain classes such as GeoPoint. For information about the
		Google APIs add-on and the library it provides, see:

		<p style="margin-left:2em;"><a
		href="http://code.google.com/android/add-ons/google-apis">http://code.google.com/android/add-ons/google-apis</a> </p></li>

		<li>The SDK add-on architecture now lets device manufacturers specify a USB
		Vendor ID in their add-ons.
		<li>The <code>android</code> tool provides a new command that scans SDK add-ons
		for their USB Vendor IDs and makes them available to adb (OS X and Linux
		versions of the SDK only). The command is <code>android update adb</code>. On
		Windows versions of the SDK, a custom USB driver is included that supports the
		"Google" and "HTC" Vendor IDs, which allow adb to recognize G1 and HTC
		Magic devices. For other devices, contact the device manufacturer
		to obtain a USB driver, especially if you have an SDK add-on that defines
		a new USB Vendor ID.</li>
		<li>The telephony, sensor, and geo fix issues in the emulator are now
		fixed.</li>
		<li>When you use adb to uninstall an upgraded application, the Android system
		now properly restores any permissions that had already been granted to the
		previous (downgrade) version of the application</li>
		</ul>

		<h2 id="1.5_r2">Android 1.5 SDK, Release 2</h2>

		<p>This SDK release provides the same developer tools as the Android 1.5 SDK,