OSDN Git Service
Nick Pelly [Tue, 12 Oct 2010 22:41:10 +0000 (15:41 -0700)]
Update Tag app for API changes.
Change-Id: Idecfee21ee58f7a19d5dcbae39c231b8e8d96095
Signed-off-by: Nick Pelly <npelly@google.com>
Ben Komalo [Wed, 13 Oct 2010 01:34:50 +0000 (18:34 -0700)]
Merge "Clean up some resources: - remove duplicated desk clocks since they were really the same icon. - shrink down the tab indicator icons to a suitable size - remove title bar from activity" into gingerbread
Ben Komalo [Wed, 13 Oct 2010 01:27:14 +0000 (18:27 -0700)]
Ignore vi backup files.
Change-Id: Ibeb80d1fee84be1cf33321eec0284a0306513646
Ben Komalo [Wed, 13 Oct 2010 01:25:09 +0000 (18:25 -0700)]
Clean up some resources:
- remove duplicated desk clocks since they were really the same icon.
- shrink down the tab indicator icons to a suitable size
- remove title bar from activity
Change-Id: I39ed7efb0e493a7ac037d6c06fa25eeb53d2332e
Nick Kralevich [Tue, 12 Oct 2010 21:43:47 +0000 (14:43 -0700)]
add SmartPoster support.
Fix off by 1 in URI handling.
Change-Id: I2007ca20c5411dd3a19aa96ea023652ed293cdc5
Ben Komalo [Wed, 13 Oct 2010 00:00:43 +0000 (17:00 -0700)]
Nuke author tags and update Manifest that I
accidentally left out of the previous CL.
Change-Id: I0e7eb27b6e79cf5df62f901ed68225eed986fca2
Ben Komalo [Tue, 12 Oct 2010 23:58:58 +0000 (16:58 -0700)]
Merge "Minor JavaDoc additions and some long line fixes." into gingerbread
Ben Komalo [Tue, 12 Oct 2010 23:34:30 +0000 (16:34 -0700)]
Minor JavaDoc additions and some long line fixes.
Change-Id: Ia416b8b7536eb6c4aec4a41dea45de5669f37155
Nick Kralevich [Tue, 12 Oct 2010 22:16:54 +0000 (15:16 -0700)]
disable proguard. This makes unittests run.
Change-Id: I566bbb83027f55ceb93927cbbb9d4113a1b73c38
Anatol Pomazau [Tue, 12 Oct 2010 21:36:08 +0000 (14:36 -0700)]
Merge "Add a util function that converts Text ndef record to text." into gingerbread
Anatol Pomazau [Tue, 12 Oct 2010 20:19:44 +0000 (13:19 -0700)]
Add a util function that converts Text ndef record to text.
Add a unit test for it.
Change-Id: I5ce2020669150e3768a19354e951b6a54cc550d4
Nick Kralevich [Tue, 12 Oct 2010 20:23:34 +0000 (13:23 -0700)]
Explain the bytes associated with the NFC type 4 tag.
Change-Id: Ibe12a8cb94032f52e02ef28a423203483b1e096f
Nick Kralevich [Tue, 12 Oct 2010 18:02:03 +0000 (11:02 -0700)]
change the tab selector icons
Change-Id: Ia12adb2e72d6b8d444fd179970ed4b27a9fa3976
Nick Kralevich [Tue, 12 Oct 2010 00:52:43 +0000 (17:52 -0700)]
Add initial support for saved vs non-saved tags.
Get rid of the third "MyTag" column. This isn't currently
being used.
Change-Id: Id35074d939e1373f0998e5502eb9cfc9c86ecca5
Nick Kralevich [Tue, 12 Oct 2010 18:01:05 +0000 (11:01 -0700)]
Merge "cleanup unused classes, show date in tag list." into gingerbread
David 'Digit' Turner [Tue, 12 Oct 2010 17:31:53 +0000 (10:31 -0700)]
Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread
David 'Digit' Turner [Fri, 8 Oct 2010 16:35:33 +0000 (18:35 +0200)]
ndk: Add missing OpenSLES headers and libraries.
Change-Id: I5444f8701a2b8ad8e99fffc6906bad1bf101530f
Nick Kralevich [Tue, 12 Oct 2010 00:28:21 +0000 (17:28 -0700)]
cleanup unused classes, show date in tag list.
Change-Id: Ie9b1eee3606d7d1cfaff73723ff40c7570a6b1c9
Kenny Root [Tue, 12 Oct 2010 00:28:20 +0000 (17:28 -0700)]
Merge "Update OBB sample to revised API" into gingerbread
Kenny Root [Mon, 11 Oct 2010 20:19:57 +0000 (13:19 -0700)]
Update OBB sample to revised API
Change-Id: Idc724170a9cbb6a94523b406b8a1f91fcf8293a4
Nick Kralevich [Mon, 11 Oct 2010 23:10:04 +0000 (16:10 -0700)]
get rid of sql finalizer error messages.
Change-Id: I5613734b78f861237b435079742528b9623c97de
Nick Kralevich [Mon, 11 Oct 2010 22:22:58 +0000 (15:22 -0700)]
bytes should be a blob.
Change-Id: I8bbf6aab8ec67d60cb6ac47cd273aec8814d2d6a
David 'Digit' Turner [Mon, 11 Oct 2010 13:02:15 +0000 (06:02 -0700)]
Merge "ndk: remove undefined symbols from system headers" into gingerbread
Raphael [Fri, 8 Oct 2010 22:41:01 +0000 (15:41 -0700)]
Update win_sdk to put binaries in SDK/platform-tools.
Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
Jeff Brown [Fri, 8 Oct 2010 19:45:05 +0000 (12:45 -0700)]
Merge "Update NDK with recent changes." into gingerbread
David 'Digit' Turner [Fri, 8 Oct 2010 15:07:39 +0000 (17:07 +0200)]
ndk: remove undefined symbols from system headers
This change removes the declaration of functions that are not
implemented by our various versions of our C library.
The corresponding declarations are moved inside #if 0 .. #endif
blocks (so it becomes easy to remember that they are missing)
Also refresh the headers a little (i.e. adding a few missing decl
and macros, remove C++ comments, etc)
See http://code.google.com/p/android/issues/detail?id=7807
Change-Id: I4ae1b1f3a181419eee2004c41b54768cc15e896f
NOTE: The missing decl are still there but encased in #if 0 .. #endif
blocks (to make it easier to implement them later). There are
a few exceptions in order to build STLport and libstdc++-v3
properly.
David 'Digit' Turner [Fri, 8 Oct 2010 07:19:10 +0000 (00:19 -0700)]
Merge "ndk: Update platform system libraries." into gingerbread
Jeff Brown [Thu, 7 Oct 2010 21:38:12 +0000 (14:38 -0700)]
Update NDK with recent changes.
Includes bitmap.h which was missing from v9 but was previously in v8.
Also includes new obb stuff and other things that have gotten out of sync.
Change-Id: I6cf9ccdbc9d3271a34a1cf8a1de78aa8a1757276
Ying Wang [Thu, 7 Oct 2010 20:04:24 +0000 (13:04 -0700)]
Set monkey process name
So you can find it easily with "ps" or "top".
Change-Id: Id52cb8bb1680bd2cc24043d08a94f0a304f1e436
David 'Digit' Turner [Thu, 7 Oct 2010 09:17:39 +0000 (11:17 +0200)]
ndk: Update platform system libraries.
This change updates various system libraries to reflect changes that
happened during distinct platform releases. All details are in the
file bionic/libc/docs/CHANGES.TXT, but the summary is:
API level 5:
pthread.h:
pthread_mutex_lock_timeout_np()
pthread_cond_timedwait_monotonic_np()
pthread_cond_timedwait_relative_np()
API level 8:
pthread.h:
pthread_condattr_init()
pthread_condattr_destroy()
pthread_condattr_setpshared()
pthread_condattr_getpshared()
dlfcn.h:
dladdr()
sched.h:
clone()
signal.h:
killpg()
stdio.h:
fdprintf()
vfdprintf()
unistd.h:
getusershell()
setusershell()
endusershell()
wchar.h:
mbstowcs()
wcstombs()
time.h:
timezone
daylight
plus symbols from new headers: <fts.h>, <regex.h>, <err.h>, <warn.h>
Change-Id: I7ff1ffa2cb37b71473b1d137c7799f17d644ab63
Anatol Pomazau [Wed, 6 Oct 2010 00:39:05 +0000 (17:39 -0700)]
Show 'Save tag' dialog even if the screen is turned off
Change-Id: I7d8b2fa74525e81db1743bf3e4283778192fc047
Nick Kralevich [Tue, 5 Oct 2010 23:28:46 +0000 (16:28 -0700)]
More data for testing.
I managed to extract data from a real NFC tag. Make that
data available for unittests / other testing.
Change-Id: I99cd8d6a32dc20fd7e33191f86def71236474d9a
Anatol Pomazau [Tue, 5 Oct 2010 23:32:43 +0000 (16:32 -0700)]
Dismiss "Save" dialog on activity stop
Change-Id: I0e63b679c9677e50f7b5b6a20c9eb840f983aa18
Nick Kralevich [Tue, 5 Oct 2010 22:26:04 +0000 (15:26 -0700)]
Have TagBroadcastReceiver start the SaveTag activity.
Change-Id: I6dc8757ca7eec87efe622b0b2688dd29c5883185
Nick Kralevich [Tue, 5 Oct 2010 19:44:50 +0000 (12:44 -0700)]
new icon.
Change-Id: I17751bbd0dc9d900002ef68ee51a4ddaf1600281
Nick Kralevich [Tue, 5 Oct 2010 19:22:20 +0000 (12:22 -0700)]
Merge "new SaveTag activity, additional utilities" into gingerbread
Dianne Hackborn [Mon, 4 Oct 2010 21:53:33 +0000 (14:53 -0700)]
Merge "New API demo showing different screen orientation options." into gingerbread
Nick Kralevich [Mon, 4 Oct 2010 16:34:39 +0000 (09:34 -0700)]
new SaveTag activity, additional utilities
The SaveTag activity will receive an intent with the
contents of the NdefRecord, and will be responsible
for commiting that record to the database.
Add NdefUtil, which can convert an NdefRecord
to a URI, and vise-versa.
Change-Id: Icf8682a00774da6e246961d34de5bc5baa7550cb
Dianne Hackborn [Sat, 2 Oct 2010 23:56:56 +0000 (16:56 -0700)]
New API demo showing different screen orientation options.
Change-Id: I75b206f86ee87b50cccc5e23140d55bd566781cd
Nick Kralevich [Fri, 1 Oct 2010 22:43:07 +0000 (15:43 -0700)]
Make unittests work, new TagBroadcastReceiver
Change-Id: I5a3a1938a7fb91c8114447d24427f2c263bda5a3
Brad Fitzpatrick [Fri, 1 Oct 2010 17:46:17 +0000 (10:46 -0700)]
Update Monkey to new StrictMode API.
Change-Id: I0f2e90496c4dece8ee3766170d8a1fe2d22a7ff4
Nick Kralevich [Fri, 1 Oct 2010 16:44:27 +0000 (09:44 -0700)]
Merge "update required permissions." into gingerbread
Ying Wang [Fri, 1 Oct 2010 16:42:13 +0000 (09:42 -0700)]
Merge "Don't send non-existent system keys." into gingerbread
Nick Kralevich [Fri, 1 Oct 2010 16:30:20 +0000 (09:30 -0700)]
update required permissions.
Change-Id: I49fb855c62aa1a11c8cbf7645aa4dbe2fa18faf3
Jeff Brown [Thu, 30 Sep 2010 22:58:59 +0000 (15:58 -0700)]
Merge "Improve touch paint sample to use geometrical touch width." into gingerbread
Jeff Brown [Thu, 30 Sep 2010 03:51:48 +0000 (20:51 -0700)]
Improve touch paint sample to use geometrical touch width.
Added multitouch support.
Fixed the trackball based drawing.
Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
Nick Kralevich [Thu, 30 Sep 2010 21:14:17 +0000 (14:14 -0700)]
initial checkin. Needs lots of love.
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
Xavier Ducrohet [Mon, 27 Sep 2010 20:58:45 +0000 (13:58 -0700)]
Integrate sdk.atree changes from DO NOT MERGE
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree
Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
Kenny Root [Thu, 30 Sep 2010 00:19:14 +0000 (17:19 -0700)]
Merge "Add OBB usage example" into gingerbread
Kenny Root [Tue, 10 Aug 2010 00:25:00 +0000 (17:25 -0700)]
Add OBB usage example
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
Ying Wang [Wed, 29 Sep 2010 01:26:18 +0000 (18:26 -0700)]
Don't send non-existent system keys.
Send only if the system key physically exists.
Change-Id: I8fa102db679c55e5bfba1c9a68ecf2bc196021cd
Eric Fischer [Tue, 28 Sep 2010 23:31:58 +0000 (16:31 -0700)]
Genericize strings with SD card references.
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:28:54 +0000 (17:28 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
David 'Digit' Turner [Fri, 24 Sep 2010 08:12:54 +0000 (01:12 -0700)]
Merge "Update prebuilt library test." into gingerbread
Dianne Hackborn [Thu, 23 Sep 2010 21:48:24 +0000 (14:48 -0700)]
Prepare for a new IActivityController method.
Change-Id: I30823fe0c06aef35a2773760ec938e7979cd1037
David 'Digit' Turner [Thu, 23 Sep 2010 14:35:51 +0000 (07:35 -0700)]
Merge "Unify NDK platform headers." into gingerbread
David 'Digit' Turner [Wed, 22 Sep 2010 16:04:36 +0000 (18:04 +0200)]
Unify NDK platform headers.
This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:
- common headers: android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs: android-N/arch-A/usr/lib --> android-N/arch-A/lib
Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276
NOTE: This also contains careful separation of API-level-specific headers.
For example, platforms/android-5/include/pthread.h contains new function
declarations that are not available when using platforms/android-3/include/pthread.h
NOTE: The NDK's build-platforms.sh script has been updated to understand the new
layout. This change in develeopment/ndk does not change the layout of
platform files under $NDK/platforms after build-platforms.sh is called.
David 'Digit' Turner [Wed, 22 Sep 2010 13:11:57 +0000 (15:11 +0200)]
Update prebuilt library test.
This is to reflect the simplification in prebuilt support.
1/ LOCAL_SRC_FILES is relative to LOCAL_PATH, like with other module types
2/ no need for LOCAL_PREBUILTS
Change-Id: If7302fe355cb25a446e31c20015098db75c00c02
Brett Chabot [Tue, 21 Sep 2010 21:28:26 +0000 (14:28 -0700)]
Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
Andy Stadler [Tue, 21 Sep 2010 21:07:22 +0000 (14:07 -0700)]
DO NOT MERGE Classpath cleanup in libcore
* libcore/security no longer exists
* many other dirs under libcore had no java code
Change-Id: I1fcfda6ce769e0d9fbd4893c46bbded586c78251
Brett Chabot [Wed, 28 Jul 2010 00:57:38 +0000 (17:57 -0700)]
Change hosttestlib to use ddm-prebuilt.
Change-Id: I9124f34e6ba5559afc9a4bf9b5c70690385db11a
Andy Stadler [Fri, 17 Sep 2010 22:59:20 +0000 (15:59 -0700)]
Cleanups for eclipse classpath DO NOT MERGE
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
Jeff Brown [Tue, 14 Sep 2010 22:27:41 +0000 (15:27 -0700)]
Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread
Jeff Brown [Tue, 14 Sep 2010 06:57:28 +0000 (23:57 -0700)]
Update NDK headers and samples to sync up with looper API changes.
Change-Id: I7082603bf280888be90dc4df687521aaae9b1d02
Megha Joshi [Tue, 14 Sep 2010 00:38:43 +0000 (17:38 -0700)]
am
42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '
42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread
* commit '
42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
Adding CrossCompatibility sample app.
Megha Joshi [Tue, 17 Aug 2010 20:56:59 +0000 (13:56 -0700)]
Adding CrossCompatibility sample app.
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
Trevor Johns [Fri, 10 Sep 2010 19:33:57 +0000 (12:33 -0700)]
am
e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit '
e55fc016a6e40edd456c0d240d06689d84a7127b' into gingerbread
* commit '
e55fc016a6e40edd456c0d240d06689d84a7127b':
Use remote_api for shell access on developer.android.com.
Trevor Johns [Fri, 10 Sep 2010 19:23:09 +0000 (12:23 -0700)]
Merge "Use remote_api for shell access on developer.android.com." into froyo
Trevor Johns [Fri, 10 Sep 2010 18:26:50 +0000 (11:26 -0700)]
Use remote_api for shell access on developer.android.com.
This allows Python shell access on developer.android.com
using the remote_api_shell.py script that's bundled with
the App Engine SDK.
Change-Id: If3c979ccbf885905a9cc3840645dcb6a5a50cfa8
Jeff Brown [Wed, 8 Sep 2010 18:53:13 +0000 (11:53 -0700)]
Merge "Add samples for secure views." into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 22:30:07 +0000 (15:30 -0700)]
Update to follow ALooper ident change.
Also the native-activity sample also has some very simple code showing
how to listen to the accelerometer.
Change-Id: I0629b8bc40cddd66233c1675cd5e8b42a9b722d8
Jeff Brown [Fri, 3 Sep 2010 17:19:28 +0000 (10:19 -0700)]
Add samples for secure views.
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
Joe Onorato [Tue, 7 Sep 2010 15:53:18 +0000 (11:53 -0400)]
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
Dianne Hackborn [Thu, 2 Sep 2010 05:58:26 +0000 (22:58 -0700)]
Add API demo for picking a contact with a permission grant.
Change-Id: I9b0659e18afb19f8050cb77104c41ea291a9e3c7
Xavier Ducrohet [Wed, 1 Sep 2010 23:48:59 +0000 (16:48 -0700)]
Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Xavier Ducrohet [Sat, 28 Aug 2010 01:47:51 +0000 (18:47 -0700)]
New SDK architecture. DO NOT MERGE.
tools normally under the platform, move to a single location
called platform-tools/
Change-Id: I70659167778303722acb107a2d04bbf01467f884
Yu Shan Emily Lau [Mon, 30 Aug 2010 22:52:59 +0000 (15:52 -0700)]
Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
Yu Shan Emily Lau [Fri, 27 Aug 2010 06:00:06 +0000 (23:00 -0700)]
Add the simple script log for the statbility stress test.
Add the randomize script option.
Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
Dianne Hackborn [Sat, 28 Aug 2010 00:00:52 +0000 (17:00 -0700)]
Fix build.
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
Derek Sollenberger [Fri, 27 Aug 2010 14:43:54 +0000 (07:43 -0700)]
Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Derek Sollenberger [Fri, 27 Aug 2010 14:34:18 +0000 (10:34 -0400)]
Disable Proguard for the SampleBrowerPlugin
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.
Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
Yu Shan Emily Lau [Thu, 26 Aug 2010 22:17:36 +0000 (15:17 -0700)]
Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
Dianne Hackborn [Thu, 26 Aug 2010 21:38:20 +0000 (14:38 -0700)]
Update to follow API.
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
Yu Shan Emily Lau [Thu, 26 Aug 2010 02:37:13 +0000 (19:37 -0700)]
Add the new option for the device sleep time. This is only for the scripted monkey.
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:13:14 +0000 (10:13 -0700)]
am
bea98acf: reconcile open-source froyo into google variant
Merge commit '
bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread
* commit '
bea98acfa2253796aeade605c7020a7cc942af41':
Explicitly enable backup by default in SDK builds
Brad Fitzpatrick [Wed, 25 Aug 2010 01:58:14 +0000 (18:58 -0700)]
Quiet harmless StrictMode violations caused by the Monkey.
The monkey writes to System.out which is effectively a file and is
caught by StrictMode.
BUG=
2947447
Change-Id: Iab38917f18baa319dad34d0c788bc9a10a041796
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:37:05 +0000 (09:37 -0700)]
reconcile open-source froyo into google variant
Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
Yu Shan Emily Lau [Wed, 25 Aug 2010 03:08:29 +0000 (20:08 -0700)]
Merge "Add the new option for the scripted monkey profile testing." into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 02:58:19 +0000 (19:58 -0700)]
Merge "Added a couple of new properties." into gingerbread
Yu Shan Emily Lau [Wed, 25 Aug 2010 01:03:32 +0000 (18:03 -0700)]
Add the new option for the scripted monkey profile testing.
Change-Id: I1013a1a0daed948f509d9a29077f0e282baf1a10
Christopher Tate [Wed, 25 Aug 2010 01:19:19 +0000 (18:19 -0700)]
am
ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
Merge commit '
ddc026b1d5633348d97d78477ff1c7c950c3f3a8' into gingerbread
* commit '
ddc026b1d5633348d97d78477ff1c7c950c3f3a8':
Explicitly enable backup by default in SDK builds
Christopher Tate [Wed, 25 Aug 2010 01:04:35 +0000 (18:04 -0700)]
Merge "Explicitly enable backup by default in SDK builds" into froyo
Brian Carlstrom [Wed, 25 Aug 2010 01:02:43 +0000 (18:02 -0700)]
Added a couple of new properties.
The Android framework crashes with an int parsing failure and then
spins wildly if it can't find an expected property.
(git cherry-pick -e
d88ee455)
Change-Id: Ie33e0261185301e6ce41b0896f9916816db9f928
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
Yu Shan Emily Lau [Thu, 19 Aug 2010 22:46:51 +0000 (15:46 -0700)]
Merge "Added the new keyword tap for the scripted monkey." into gingerbread
Yu Shan Emily Lau [Thu, 19 Aug 2010 21:57:42 +0000 (14:57 -0700)]
Added the new keyword tap for the scripted monkey.
Change-Id: Iabfc462f8fc853b3235aa0d742fa46c97e980b77
Yu Shan Emily Lau [Thu, 19 Aug 2010 18:11:28 +0000 (11:11 -0700)]
Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread
Yu Shan Emily Lau [Wed, 18 Aug 2010 03:00:07 +0000 (20:00 -0700)]
Add the monkey event which allows the scripted monkey to execute the shell command.
Change-Id: Id5548fc42fc5c7bee6879fffc580e134a75572ab