Merge branch 'froyo' into froyo-release (0a7c4060) · Commits · e / os / android_frameworks_base

Android.mk

+4 −3

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ LOCAL_SRC_FILES += \
		core/java/android/net/IConnectivityManager.aidl \
		core/java/android/net/INetworkManagementEventObserver.aidl \
		core/java/android/net/IThrottleManager.aidl \
		core/java/android/os/IHardwareService.aidl \
		core/java/android/os/IMessenger.aidl \
		core/java/android/os/storage/IMountService.aidl \
		core/java/android/os/storage/IMountServiceListener.aidl \
		@@ -439,8 +440,8 @@ framework_docs_SDK_PREVIEW:=0
		## Latest ADT version identifiers, for reference from published docs
		framework_docs_ADT_VERSION:=0.9.7
		framework_docs_ADT_DOWNLOAD:=ADT-0.9.7.zip
		framework_docs_ADT_BYTES:=na
		framework_docs_ADT_CHECKSUM:=na
		framework_docs_ADT_BYTES:=8033750
		framework_docs_ADT_CHECKSUM:=de2431c8d4786d127ae5bfc95b4605df

		framework_docs_LOCAL_DROIDDOC_OPTIONS += \
		-hdf sdk.version $(framework_docs_SDK_VERSION) \

core/java/android/app/backup/BackupAgent.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -162,9 +162,10 @@ public abstract class BackupAgent extends ContextWrapper {
		* file descriptor pointing to a full snapshot of the
		* application's data. The application should consume every
		* entity represented in this data stream.
		* @param appVersionCode The
		* {@link android.R.styleable#AndroidManifest_versionCode android:versionCode}
		* value of the application that backed up this particular data set. This
		* @param appVersionCode The value of the <a
		* href="{@docRoot}guide/topics/manifest/manifest-element.html#vcode">{@code
		* android:versionCode}</a> manifest attribute,
		* from the application that backed up this particular data set. This
		* makes it possible for an application's agent to distinguish among any
		* possible older data versions when asked to perform the restore
		* operation.

core/java/android/app/backup/package.html

+16 −11

Original line number	Diff line number	Diff line
		@@ -2,23 +2,28 @@
		<BODY>
		<p>Contains the backup and restore functionality available to
		applications. If a user wipes the data on their device or upgrades to a new Android-powered
		device, all applications that have enabled backup will restore the user's previous data and/or
		preferences. {@more} All backup management is controlled through
		{@link android.app.backup.BackupManager}. Individual backup functionality is
		implemented through a subclass {@link android.app.backup.BackupAgent} and a
		simple and easy-to-use implementation is provided in
		{@link android.app.backup.BackupAgentHelper}.</p>
		device, all applications that have enabled backup will restore the user's previous data.</p>
		{@more}

		<p>STOPSHIP: add more documentation and remove Dev Guide link if not written!</p>
		<p>All backup and restore operations are controlled by the {@link
		android.app.backup.BackupManager}. Each application that would
		like to enable backup and preserve its data on remote strage must implement a
		backup agent. A backup agent can be built by extending either {@link android.app.backup.BackupAgent}
		or {@link android.app.backup.BackupAgentHelper}. The {@link
		android.app.backup.BackupAgentHelper} class provides a wrapper around {@link
		android.app.backup.BackupAgent} that simplifies the procedures to implement a backup agent by
		employing backup helpers such as {@link android.app.backup.SharedPreferencesBackupHelper} and
		{@link android.app.backup.FileBackupHelper}.</p>

		<p>The backup APIs let applications:</p>
		<ul>
		<li>Perform backup of arbitrary data</li>
		<li>Easily perform backup of Preferences and files</li>
		<li>Handle restore of data</li>
		<li>Perform backup of arbitrary data to remote storage</li>
		<li>Easily perform backup of {@link android.content.SharedPreferences} and files</li>
		<li>Restore the data saved to remote storage</li>
		</ul>

		<p>For a detailed guide to using the backup APIs, see the <a
		href="{@docRoot}guide/topics/backup.html">Backup Dev Guide topic</a>.</p>
		href="{@docRoot}guide/topics/data/backup.html">Data Backup</a> developer guide.</p>

		</BODY>
		</HTML>

core/java/android/os/IHardwareService.aidl

0 → 100755

+26 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2007, 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 android.os;

		/** {@hide} */
		interface IHardwareService
		{
		// obsolete flashlight support
		boolean getFlashlightEnabled();
		void setFlashlightEnabled(boolean on);
		}

core/res/res/values-cs/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -855,7 +855,7 @@
		<string name="description_star" msgid="2654319874908576133">"oblíbené"</string>
		<string name="car_mode_disable_notification_title" msgid="3164768212003864316">"Aktivován režim V autě"</string>
		<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Vyberte, chcete-li ukončit režim Na cestě."</string>
		<string name="tethered_notification_title" msgid="8146103971290167718">"Sdílení je aktivní"</string>
		<string name="tethered_notification_title" msgid="3146694234398202601">"Je aktivní tethering nebo hotspot"</string>
		<string name="tethered_notification_message" msgid="3067108323903048927">"Dotykem zahájíte konfiguraci"</string>
		<string name="throttle_warning_notification_title" msgid="4890894267454867276">"Vysoké využití mobilních dat"</string>
		<string name="throttle_warning_notification_message" msgid="2609734763845705708">"Dotykem zobrazíte další informace o využití mobilních dat"</string>