OSDN Git Service
Svetoslav Ganov [Tue, 17 Aug 2010 17:48:34 +0000 (10:48 -0700)]
am
4b06026c: am
9f93186b: Adding a sample accessibility service
Merge commit '
4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp
* commit '
4b06026cb901d4a032ecc731a835767ff1bf27fe':
Adding a sample accessibility service
Svetoslav Ganov [Tue, 17 Aug 2010 17:45:23 +0000 (10:45 -0700)]
am
9f93186b: Adding a sample accessibility service
Merge commit '
9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread
* commit '
9f93186beae13ea057a4b2e867928b357cd650a4':
Adding a sample accessibility service
Mathias Agopian [Mon, 16 Aug 2010 23:54:37 +0000 (16:54 -0700)]
am
a37be42f: Reformat to Android style guidelines
Merge commit '
a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp
* commit '
a37be42f9f4d0f54f8ff10524ee023177f0b7990':
Reformat to Android style guidelines
Mathias Agopian [Mon, 16 Aug 2010 23:54:33 +0000 (16:54 -0700)]
am
a7c85d92: Take screen rotation into account
Merge commit '
a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp
* commit '
a7c85d92351070605b93176c1f691f4f80321ad5':
Take screen rotation into account
Mathias Agopian [Mon, 16 Aug 2010 23:13:24 +0000 (16:13 -0700)]
Reformat to Android style guidelines
Change-Id: Ib9d7e39464a246dbaae38e00fbb325f153f89f65
Jean-Baptiste Queru [Mon, 16 Aug 2010 20:16:44 +0000 (13:16 -0700)]
am
4388d2c3: Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)"
Merge commit '
4388d2c333c164ce67db6d4a59cded8dfea9fc9a' into gingerbread-plus-aosp
* commit '
4388d2c333c164ce67db6d4a59cded8dfea9fc9a':
Monkey: Set the name of the process to distinguish from generic name (app_process)
Mathias Agopian [Mon, 16 Aug 2010 19:55:18 +0000 (12:55 -0700)]
Take screen rotation into account
Change-Id: I354c58eb1d28552d46b8fa269e12c00eaf6cbb99
Jean-Baptiste Queru [Mon, 16 Aug 2010 16:19:10 +0000 (09:19 -0700)]
Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)"
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:24:20 +0000 (08:24 -0700)]
am
898004c4: Merge "Activity/provider used is restricted to the application\'s Package, but can be spread across other packages as well. A better way to construct the activity name should be by getting the substring from the fully qualified classname itself and not usi
Merge commit '
898004c4b2322c8fece08944731eed9fc08a14a5' into gingerbread-plus-aosp
* commit '
898004c4b2322c8fece08944731eed9fc08a14a5':
Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:11:53 +0000 (08:11 -0700)]
Merge "Activity/provider used is restricted to the application's Package, but can be spread across other packages as well. A better way to construct the activity name should be by getting the substring from the fully qualified classname itself and not using the PackageInfo. Credit:Ritu Srivastava"
Ying Wang [Thu, 12 Aug 2010 20:14:11 +0000 (13:14 -0700)]
am
8fc77898: Fix keycode. [Cherry-pick from master]
Merge commit '
8fc778984cd0b737df102fca14be7c1815505b80' into gingerbread-plus-aosp
* commit '
8fc778984cd0b737df102fca14be7c1815505b80':
Fix keycode. [Cherry-pick from master]
Ying Wang [Thu, 12 Aug 2010 18:30:41 +0000 (11:30 -0700)]
Fix keycode. [Cherry-pick from master]
see frameworks/base/core/java/android/view/KeyEvent.java.
Change-Id: Ic9a355b36815c4ac7db9c57c14bfe933585cf963
http://b/issue?id=
2830562
Svetoslav Ganov [Wed, 11 Aug 2010 04:41:06 +0000 (21:41 -0700)]
Adding a sample accessibility service
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
Dianne Hackborn [Wed, 11 Aug 2010 07:47:46 +0000 (00:47 -0700)]
am
79b946e8: Some native activity sample code cleanup.
Merge commit '
79b946e8f2ccb552e1a3fe8222f660b9a76cc001' into gingerbread-plus-aosp
* commit '
79b946e8f2ccb552e1a3fe8222f660b9a76cc001':
Some native activity sample code cleanup.
Dianne Hackborn [Wed, 4 Aug 2010 18:13:03 +0000 (11:13 -0700)]
Some native activity sample code cleanup.
Update to include newest headers and library, tweak glue code to
work better with state saving and add support for config changes.
Change-Id: I4d27bd4a0f542f217efaec86cf4f219aca020426
Raphael Moll [Tue, 10 Aug 2010 18:39:50 +0000 (11:39 -0700)]
am
ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit '
ff779c0f2a19985a9a6733d4864b4b56b20729bd' into gingerbread-plus-aosp
* commit '
ff779c0f2a19985a9a6733d4864b4b56b20729bd':
Update win_sdk to put binaries in SDK/platform-tools.
Raphael Moll [Thu, 5 Aug 2010 20:30:39 +0000 (13:30 -0700)]
Update win_sdk to put binaries in SDK/platform-tools.
This is requires as a follow up to Change I4526310a
with moved platform tools from $SDK/platform/*/tools
to $SDK/platform-tools/
SDK Bug:
2897406
Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
Vairavan Srinivasan [Tue, 3 Aug 2010 17:00:55 +0000 (10:00 -0700)]
Monkey: Set the name of the process to distinguish from generic name (app_process)
Change-Id: If58ff437bfbea421dc00a2d85547267c010871e4
Xavier Ducrohet [Fri, 30 Jul 2010 18:29:30 +0000 (11:29 -0700)]
am
b86b7f72: Re-organize the SDK, moving the build tools out of the platforms.
Merge commit '
b86b7f72db1549cb526a141ca8b6158908483f1a' into gingerbread-plus-aosp
* commit '
b86b7f72db1549cb526a141ca8b6158908483f1a':
Re-organize the SDK, moving the build tools out of the platforms.
David 'Digit' Turner [Fri, 30 Jul 2010 01:27:20 +0000 (18:27 -0700)]
am
f4790e6f: Separate platform files and samples by API level.
Merge commit '
f4790e6f9e47347996e62ecd27ff55b6499cf97a' into gingerbread-plus-aosp
* commit '
f4790e6f9e47347996e62ecd27ff55b6499cf97a':
Separate platform files and samples by API level.
David 'Digit' Turner [Fri, 30 Jul 2010 01:07:56 +0000 (18:07 -0700)]
Separate platform files and samples by API level.
Remove all duplicate platform files, i.e development/ndk/platforms/android-N now
only contains files that are introduced in API level 'N' and not found in level 'N-1'
(This makes it easier to manage independent platform release branches, and makes
platform additions trivial to examine and maintain).
Move samples that depends on features of API level 'N' into platforms/android-N/samples
+ update tests/run-all.sh accordingly
Change-Id: I04c4c67c6c674c1714d5812d461d0524a4f4cfd9
Xavier Ducrohet [Tue, 27 Jul 2010 22:07:35 +0000 (15:07 -0700)]
Re-organize the SDK, moving the build tools out of the platforms.
Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
Brett Chabot [Wed, 28 Jul 2010 18:37:12 +0000 (11:37 -0700)]
am
8ddb2873: Change hosttestlib to use ddm-prebuilt.
Merge commit '
8ddb2873df96c7181c9358f5c9286e273648bf89' into gingerbread-plus-aosp
* commit '
8ddb2873df96c7181c9358f5c9286e273648bf89':
Change hosttestlib to use ddm-prebuilt.
Brett Chabot [Wed, 28 Jul 2010 00:57:38 +0000 (17:57 -0700)]
Change hosttestlib to use ddm-prebuilt.
Change-Id: Ibd1c44096893bc8804a4d7644fc83d2edd443bb2
Bill Napier [Wed, 28 Jul 2010 00:12:57 +0000 (17:12 -0700)]
am
32553f52: Remove monkeyrunner so it can move to the SDK project.
Merge commit '
32553f5291b1e0c5363db8bd7f280037f4f600e2' into gingerbread-plus-aosp
* commit '
32553f5291b1e0c5363db8bd7f280037f4f600e2':
Remove monkeyrunner so it can move to the SDK project.
Eric Fischer [Tue, 27 Jul 2010 23:35:22 +0000 (16:35 -0700)]
am
cc7fc9e8: Update time zone data to the new version 2010k.
Merge commit '
cc7fc9e839cee6c33d099a94c5bdb655bd83ccd9' into gingerbread-plus-aosp
* commit '
cc7fc9e839cee6c33d099a94c5bdb655bd83ccd9':
Update time zone data to the new version 2010k.
Bill Napier [Tue, 27 Jul 2010 23:08:06 +0000 (16:08 -0700)]
Remove monkeyrunner so it can move to the SDK project.
Change-Id: Ibedfae41cf8a71d66f25267cd3a360de222e2644
Eric Fischer [Mon, 26 Jul 2010 22:54:28 +0000 (15:54 -0700)]
Update time zone data to the new version 2010k.
Change-Id: Ifaadb0c75343bf271232dcd72f53fd34bb33aca1
Xavier Ducrohet [Mon, 26 Jul 2010 18:40:38 +0000 (11:40 -0700)]
am
235a95ae: Update the monkeyrunner to use the new DDMlib API.
Merge commit '
235a95ae49e9dd40003e99c35bd79fe007347fb3' into gingerbread-plus-aosp
* commit '
235a95ae49e9dd40003e99c35bd79fe007347fb3':
Update the monkeyrunner to use the new DDMlib API.
Xavier Ducrohet [Wed, 21 Jul 2010 23:50:22 +0000 (16:50 -0700)]
Update the monkeyrunner to use the new DDMlib API.
Change-Id: I0c1e17b450e264ca1e7d98523bde4ddfe1d97252
Jean-Baptiste Queru [Sat, 24 Jul 2010 01:45:02 +0000 (18:45 -0700)]
resolved conflicts for merge of
ecd4a4d0 to gingerbread-plus-aosp
Change-Id: I623544ad03ae1a750fac6b0f8a3427fc5590b5c9
Jean-Baptiste Queru [Sat, 24 Jul 2010 01:35:58 +0000 (18:35 -0700)]
Merge "Corrected Classpath"
Vairavan Srinivasan [Thu, 22 Jul 2010 16:30:38 +0000 (09:30 -0700)]
am
688e62cd: Monkey: Changes to release lock before reporting ANR and meminfo
Merge commit '
688e62cd116d0bc17ad162915908764c67dd6045' into gingerbread-plus-aosp
* commit '
688e62cd116d0bc17ad162915908764c67dd6045':
Monkey: Changes to release lock before reporting ANR and meminfo
Xavier Ducrohet [Thu, 22 Jul 2010 00:01:40 +0000 (17:01 -0700)]
am
98de4a25: Update source.properties for SDK platform component.
Merge commit '
98de4a25089c9e604e45e72db5fcde67add66643' into gingerbread-plus-aosp
* commit '
98de4a25089c9e604e45e72db5fcde67add66643':
Update source.properties for SDK platform component.
Xavier Ducrohet [Wed, 21 Jul 2010 23:30:05 +0000 (16:30 -0700)]
Update source.properties for SDK platform component.
Change-Id: I4226a31d33fffbeb326ef2aea792a0676139fb1a
Vairavan Srinivasan [Tue, 20 Jul 2010 21:09:17 +0000 (14:09 -0700)]
Monkey: Changes to release lock before reporting ANR and meminfo
Report ANR, dumpsys after releasing lock on Monkey.this.
This ensures the availability of the lock to Activity controller's
appNotResponding.
Reporting dumpsys while holding the lock on this causes a cyclic
deadlock, when twoANRs are reported (one after the other).
Monkey's ActivityController is registered to ActivityManagerService
for handling ANR.The first ANR caused by either service timeout or
broadcast timeout is reported byActivityManagerService to Monkey's
ActivityController via Binder. Meanwhile, the lock on
ActivityManagerService is held by serviceTimeout or broadcastTimeout.
appNotResponding corresponding to first ANR reports procrank and
acquires a lock onMonkey.this and sets few bool variables like
mRequestAnrTraces and mRequestDumpsysMemInfoand returns the control
to ActivityManagerService's service/broadcast timeout.
VM executing monkey process switches the control to main monkey
thread and it acquires thelock on Monkey.this and proceeds to report
ANR traces.
Meanwhile, a second ANR occurs and Activity Manager Service invokes
ActivityController's appNotResponding (via binder). appNotResponding
reports the procrank and waits to acquire the lock on Monkey.this
which is being held by Monkey's main thread(busy reporting first ANR).
This results in a blocking wait for ActivityManagerService's
appNotRespondingLocked() (corresponding to second ANR).
Meanwhile, the monkey's main thread (holding lock on Monkey.this)
tries to report the meminfo for first ANR, invokes
reportDumpsysMemInfo(), which in turn causes the android runtime to
launch dumpsys process. The dumpsys process queries service manager
to get a reference to meminfo service and invoke dump() on the same.
The meminfo service is created by ActivityManagerService's
setSystemProcess(). The dump() method tries to acquire a lock on
ActivityManagerService which is held by ActivityManagerService's
service/broadcasttimeout (awaiting the response from
ActivityController for the second ANR).
This cyclic deadlock continues for a minute after which WatchDog
thread of system_server kills system_server as it hasn't got the
response from ActivityManagerService's monitor(). The monitor()
of ActivityManagerService too tries to acquire lock on this and is
invoked once in every minute.
DEADLOCK:
--------
ActivityManager --> ActivityController --> Monkey Main --> MemInfo
--> ActivityManager
Change-Id: I7718eff332e5551b1950ab1c45395bf1ff4b1bda
Christian Mehlmauer [Fri, 25 Jun 2010 15:03:51 +0000 (17:03 +0200)]
Corrected Classpath
Removed Alarmclock app, due it's not needed any more and causes Errors with DeskClock
Removed not existing google Folders in out dir
Corrected path for frameworks/ex
Change-Id: I9d947f1e257cacc2142b141c2f2fe77076330705
Nick Kralevich [Tue, 20 Jul 2010 00:03:10 +0000 (17:03 -0700)]
am
ad0d46a4: Merge "documentation fix when downloading repo" into gingerbread
Merge commit '
ad0d46a4088ff24d8582a751f589d9006def9e0a' into gingerbread-plus-aosp
* commit '
ad0d46a4088ff24d8582a751f589d9006def9e0a':
documentation fix when downloading repo
Nick Kralevich [Tue, 20 Jul 2010 00:00:42 +0000 (17:00 -0700)]
Merge "documentation fix when downloading repo" into gingerbread
David 'Digit' Turner [Sat, 17 Jul 2010 16:07:42 +0000 (09:07 -0700)]
am
ad77ed7d: ndk: fix samples compilation
Merge commit '
ad77ed7d47e7e4037905ccc220bde65d24825f71' into gingerbread-plus-aosp
* commit '
ad77ed7d47e7e4037905ccc220bde65d24825f71':
ndk: fix samples compilation
David 'Digit' Turner [Fri, 16 Jul 2010 21:52:50 +0000 (14:52 -0700)]
ndk: fix samples compilation
Change-Id: I3e0f88f823c891cea5ca3f82f7c3a6284295425c
David 'Digit' Turner [Fri, 16 Jul 2010 21:42:46 +0000 (14:42 -0700)]
am
6d0ef0df: ndk: handle --verbose option in tests/run-all.sh script
Merge commit '
6d0ef0df9852b3750f88bb38dfaeebe527df7be3' into gingerbread-plus-aosp
* commit '
6d0ef0df9852b3750f88bb38dfaeebe527df7be3':
ndk: handle --verbose option in tests/run-all.sh script
David 'Digit' Turner [Fri, 16 Jul 2010 21:31:30 +0000 (14:31 -0700)]
ndk: handle --verbose option in tests/run-all.sh script
Change-Id: Ib99020a8b5c76c34bcbf8244426221bb3b6d2663
Dianne Hackborn [Fri, 16 Jul 2010 05:24:48 +0000 (22:24 -0700)]
am
e551875b: Update NDK for pre-key-dispatching changes.
Merge commit '
e551875b2d82ed2709a28e046759523cb87ba2e2' into gingerbread-plus-aosp
* commit '
e551875b2d82ed2709a28e046759523cb87ba2e2':
Update NDK for pre-key-dispatching changes.
Dianne Hackborn [Fri, 16 Jul 2010 00:48:05 +0000 (17:48 -0700)]
Update NDK for pre-key-dispatching changes.
The same code now calls the appropriate function as part of
its key processing.
Change-Id: Ie6fbcd802b098b85d8113fe0a49473134721009b
David 'Digit' Turner [Thu, 15 Jul 2010 23:32:23 +0000 (16:32 -0700)]
am
3d81d6a2: Merge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread
Merge commit '
3d81d6a2eb8be4649891687cb3354a66b981dfc8' into gingerbread-plus-aosp
* commit '
3d81d6a2eb8be4649891687cb3354a66b981dfc8':
ndk: add tests/run-all.sh to run all automated tests.
David 'Digit' Turner [Thu, 15 Jul 2010 23:30:12 +0000 (16:30 -0700)]
Merge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread
David 'Digit' Turner [Thu, 15 Jul 2010 23:20:59 +0000 (16:20 -0700)]
ndk: add tests/run-all.sh to run all automated tests.
For now, this only tries to rebuild all samples from scratch
Change-Id: I0d059b72b68d5abcfb462b897813dd60399612ef
Christopher Tate [Thu, 15 Jul 2010 22:03:26 +0000 (15:03 -0700)]
am
284e3ae1: Merge "NDK access to the Asset Manager" into gingerbread
Merge commit '
284e3ae11c6f1fee5b2d417eea16b3a2126a04a5' into gingerbread-plus-aosp
* commit '
284e3ae11c6f1fee5b2d417eea16b3a2126a04a5':
NDK access to the Asset Manager
Christopher Tate [Thu, 15 Jul 2010 22:00:16 +0000 (15:00 -0700)]
Merge "NDK access to the Asset Manager" into gingerbread
Scott Main [Thu, 15 Jul 2010 18:27:22 +0000 (11:27 -0700)]
am
435959e7: am
f0f2aba8: Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo
Merge commit '
435959e72b623a41ff4384862b924102dd7a1bc6' into gingerbread-plus-aosp
* commit '
435959e72b623a41ff4384862b924102dd7a1bc6':
update notepad tutorial to change activity title in NoteEdit class
Scott Main [Thu, 15 Jul 2010 18:25:07 +0000 (11:25 -0700)]
am
f0f2aba8: Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo
Merge commit '
f0f2aba8925b7f88af6c3af479c560e4e6b67ee4' into gingerbread
* commit '
f0f2aba8925b7f88af6c3af479c560e4e6b67ee4':
update notepad tutorial to change activity title in NoteEdit class
Scott Main [Thu, 15 Jul 2010 18:22:52 +0000 (11:22 -0700)]
Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo
Joe Onorato [Thu, 15 Jul 2010 18:12:37 +0000 (11:12 -0700)]
am
288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread
Merge commit '
288d90c212b534e85ccf12d7bc1b5bd1d0562c5b' into gingerbread-plus-aosp
* commit '
288d90c212b534e85ccf12d7bc1b5bd1d0562c5b':
The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
Joe Onorato [Thu, 15 Jul 2010 18:08:07 +0000 (11:08 -0700)]
Merge "The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 02:56:38 +0000 (19:56 -0700)]
The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
The SDK is not dependent on configurations, and also this speeds up the post-installclean build.
Change-Id: I1c075ddf1dd2ca44cc0aa37f23e86ccc593cc2a8
Mathias Agopian [Wed, 14 Jul 2010 23:36:10 +0000 (16:36 -0700)]
am
4619318d: Merge "Sample code to illustrate how to use the accelerometer" into gingerbread
Merge commit '
4619318dd1398bd4f87b2e74827b9fb9796a2643' into gingerbread-plus-aosp
* commit '
4619318dd1398bd4f87b2e74827b9fb9796a2643':
Sample code to illustrate how to use the accelerometer
Mathias Agopian [Wed, 14 Jul 2010 23:31:10 +0000 (16:31 -0700)]
Merge "Sample code to illustrate how to use the accelerometer" into gingerbread
David 'Digit' Turner [Wed, 14 Jul 2010 22:39:04 +0000 (15:39 -0700)]
am
4948c163: Remove prebuilt static library "libthreaded_app.a".
Merge commit '
4948c163663ecc343c97e4c2a2139234f1d3273f' into gingerbread-plus-aosp
* commit '
4948c163663ecc343c97e4c2a2139234f1d3273f':
Remove prebuilt static library "libthreaded_app.a".
Nick Kralevich [Wed, 14 Jul 2010 17:25:58 +0000 (10:25 -0700)]
documentation fix when downloading repo
Change-Id: I3ceb3abe0cc3cd19954331086ba1cb73c855fde2
David 'Digit' Turner [Wed, 14 Jul 2010 00:00:24 +0000 (17:00 -0700)]
Remove prebuilt static library "libthreaded_app.a".
Make the "glue library" part of the NDK as an importable module,
this has several benefits:
- no need to distribute a binary here with no easy way to regenerate it
- no need to explicitely list -lthreaded_app in your LOCAL_LDLIBS
(this is handled automatically by the module import capability)
- allows easier native debugging of what's really happening.
Note that the header is renamed <threaded_native_app.h>
+ Modify the native-activity sample to use and import the new module
+ Start documenting usage in the header file. We probably need something
better, and will probably put it under development/ndk/docs/ at some
point.
After this patch, we should be able to get rid of the code under
framework/base/native/{include.glue}
Change-Id: I6e81d70a225a6ca006beabf6e8b42529e8f371b9
Mathias Agopian [Sat, 3 Jul 2010 01:12:04 +0000 (18:12 -0700)]
Sample code to illustrate how to use the accelerometer
this is a small particle + physics system that shows how
to integrate accleration data into positions accurately.
Change-Id: I3bbdc433f52d98464269ac8cb996c4cf037ae8d6
Christopher Tate [Tue, 13 Jul 2010 23:27:45 +0000 (16:27 -0700)]
NDK access to the Asset Manager
Change-Id: Ibe380e352af98f953bfc2398b498a6ccb242bcec
Dianne Hackborn [Wed, 14 Jul 2010 01:55:43 +0000 (18:55 -0700)]
am
98b2c359: Copy over updated NDK APIs and follow other API changes.
Merge commit '
98b2c359c2b3361f43e14b0c5d07a02c055dd10e' into gingerbread-plus-aosp
* commit '
98b2c359c2b3361f43e14b0c5d07a02c055dd10e':
Copy over updated NDK APIs and follow other API changes.
Dianne Hackborn [Wed, 14 Jul 2010 00:51:26 +0000 (17:51 -0700)]
Copy over updated NDK APIs and follow other API changes.
Change-Id: Ifec95268c9ade21963eea13357ec2f56fd7968c2
Jeff Brown [Wed, 14 Jul 2010 00:43:46 +0000 (17:43 -0700)]
am
52705bb0: Add initial gamepad support.
Merge commit '
52705bb02c7679f68585544d39480f26adb6f1e9' into gingerbread-plus-aosp
* commit '
52705bb02c7679f68585544d39480f26adb6f1e9':
Add initial gamepad support.
Jeff Brown [Wed, 14 Jul 2010 00:43:39 +0000 (17:43 -0700)]
am
fd606bc3: Migrate to new keycode constants in keycodes.h.
Merge commit '
fd606bc303bdf1fafefc4a6b79d050faa26d0800' into gingerbread-plus-aosp
* commit '
fd606bc303bdf1fafefc4a6b79d050faa26d0800':
Migrate to new keycode constants in keycodes.h.
Jeff Brown [Tue, 13 Jul 2010 23:45:16 +0000 (16:45 -0700)]
Add initial gamepad support.
Change-Id: Ide1922ea36f8b64100b4dba57e718479b8a0bec5
Jeff Brown [Tue, 13 Jul 2010 23:14:54 +0000 (16:14 -0700)]
Migrate to new keycode constants in keycodes.h.
Change-Id: I775efb0f73b418db5bf65c218949b164f8e65647
David 'Digit' Turner [Tue, 13 Jul 2010 23:46:11 +0000 (16:46 -0700)]
am
5ef6b2f2: ndk sample hello-neon: use to access the \'cpufeatures\' library
Merge commit '
5ef6b2f2568944e9dedf31c83716b8dd94dd506a' into gingerbread-plus-aosp
* commit '
5ef6b2f2568944e9dedf31c83716b8dd94dd506a':
ndk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library
David 'Digit' Turner [Tue, 13 Jul 2010 22:50:46 +0000 (15:50 -0700)]
ndk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library
Change-Id: I29397158de0ccdd89dfe4da72a544fad14a8324e
Dianne Hackborn [Sat, 10 Jul 2010 01:27:47 +0000 (18:27 -0700)]
am
29534f62: Update for improved glue.
Merge commit '
29534f6275fdc4cba1c732f89f8442b6d887eb50' into gingerbread-plus-aosp
* commit '
29534f6275fdc4cba1c732f89f8442b6d887eb50':
Update for improved glue.
Dianne Hackborn [Sat, 10 Jul 2010 01:21:45 +0000 (18:21 -0700)]
Update for improved glue.
Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558
Dianne Hackborn [Sat, 10 Jul 2010 00:03:10 +0000 (17:03 -0700)]
am
1aa32188: Add new native-plasma sample code.
Merge commit '
1aa3218800a9d98c7b62450a3821b99b8b9588e0' into gingerbread-plus-aosp
* commit '
1aa3218800a9d98c7b62450a3821b99b8b9588e0':
Add new native-plasma sample code.
Dianne Hackborn [Fri, 9 Jul 2010 18:48:23 +0000 (11:48 -0700)]
Add new native-plasma sample code.
This shows direct drawing to an ANativeWindow's bits.
Update the NDK API, and fix a bug in the native-activity app where it
would hang while exiting.
Change-Id: I4fa98d083405eb0d1b22b10a73a2ef18d45fdb59
Ying Wang [Fri, 9 Jul 2010 22:15:22 +0000 (15:15 -0700)]
Ying Wang [Fri, 9 Jul 2010 22:04:40 +0000 (15:04 -0700)]
Fix keycode
4 new key codes were added since gingerbread.
bug: http://b/issue?id=
2830562
Change-Id: I91a55ef6ca9244bc053e25b6dd8d514cb3f106e9
The Android Open Source Project [Fri, 9 Jul 2010 21:42:33 +0000 (14:42 -0700)]
merge from open-source master
Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c
David 'Digit' Turner [Fri, 9 Jul 2010 17:06:02 +0000 (10:06 -0700)]
am
f68d6af8: ndk: Add a test to check that prebuilt libraries work as expected.
Merge commit '
f68d6af83f8f99714c139d867e8328f558480f28' into gingerbread-plus-aosp
* commit '
f68d6af83f8f99714c139d867e8328f558480f28':
ndk: Add a test to check that prebuilt libraries work as expected.
David 'Digit' Turner [Fri, 9 Jul 2010 16:56:31 +0000 (09:56 -0700)]
ndk: Add a test to check that prebuilt libraries work as expected.
Change-Id: I7c0683ac1ee50bb62cc0f7ac22e839f749ec1cdf
Jean-Baptiste Queru [Thu, 8 Jul 2010 23:23:59 +0000 (16:23 -0700)]
Merge "update 404'd source.android.com URLs"
Dianne Hackborn [Thu, 8 Jul 2010 19:28:33 +0000 (12:28 -0700)]
am
eefb5c2d: Merge "Update native_activity sample to use new glue code." into gingerbread
Merge commit '
eefb5c2dca087c2b0a0ef90e15db00fb5523d8af' into gingerbread-plus-aosp
* commit '
eefb5c2dca087c2b0a0ef90e15db00fb5523d8af':
Update native_activity sample to use new glue code.
Dianne Hackborn [Thu, 8 Jul 2010 19:25:41 +0000 (12:25 -0700)]
Merge "Update native_activity sample to use new glue code." into gingerbread
Dianne Hackborn [Wed, 7 Jul 2010 21:33:00 +0000 (14:33 -0700)]
Update native_activity sample to use new glue code.
The native_activity sample is now built with the new threaded_app
glue code, removing all of the boiler-plate code from it. This
adds the glue code (header and .a) to the NDK.
Change-Id: I2a7be473811f22f948dcda3da8034dd0bd62049d
Yu Shan Emily Lau [Thu, 8 Jul 2010 18:33:29 +0000 (11:33 -0700)]
am
ec87ca5f: am
34ca4b64: Merge "Add the support for the alarmManager and force the device to wake up." into froyo
Merge commit '
ec87ca5f3abb615d75ee68ad977b3a17c3c7d3ab' into gingerbread-plus-aosp
* commit '
ec87ca5f3abb615d75ee68ad977b3a17c3c7d3ab':
Add the support for the alarmManager and force the device to wake up.
Yu Shan Emily Lau [Thu, 8 Jul 2010 18:31:07 +0000 (11:31 -0700)]
am
34ca4b64: Merge "Add the support for the alarmManager and force the device to wake up." into froyo
Merge commit '
34ca4b646b20cc209b06fec482e6c77dbc92d220' into gingerbread
* commit '
34ca4b646b20cc209b06fec482e6c77dbc92d220':
Add the support for the alarmManager and force the device to wake up.
Yu Shan Emily Lau [Thu, 8 Jul 2010 18:28:33 +0000 (11:28 -0700)]
Merge "Add the support for the alarmManager and force the device to wake up." into froyo
David 'Digit' Turner [Wed, 7 Jul 2010 21:22:27 +0000 (14:22 -0700)]
am
d15a18bd: Merge "Remove C++ headers from the platform directories." into gingerbread
Merge commit '
d15a18bdd2762524d3aff505eea5bd7714b10a6c' into gingerbread-plus-aosp
* commit '
d15a18bdd2762524d3aff505eea5bd7714b10a6c':
Remove C++ headers from the platform directories.
David 'Digit' Turner [Wed, 7 Jul 2010 21:19:10 +0000 (14:19 -0700)]
Merge "Remove C++ headers from the platform directories." into gingerbread
David 'Digit' Turner [Wed, 7 Jul 2010 21:16:52 +0000 (14:16 -0700)]
am
2708f19b: Merge "Update API level 9 sysroot to allow static C++ destructors to be called on dlclose()." into gingerbread
Merge commit '
2708f19ba33163b1ac0c5ea2758d0c09d97e8cc0' into gingerbread-plus-aosp
* commit '
2708f19ba33163b1ac0c5ea2758d0c09d97e8cc0':
Update API level 9 sysroot to allow static C++ destructors to be called on dlclose().
David 'Digit' Turner [Wed, 7 Jul 2010 21:14:47 +0000 (14:14 -0700)]
Merge "Update API level 9 sysroot to allow static C++ destructors to be called on dlclose()." into gingerbread
David 'Digit' Turner [Wed, 7 Jul 2010 19:53:45 +0000 (12:53 -0700)]
Remove C++ headers from the platform directories.
We now rely instead on the content of $NDK/sources/cxx-stl/system/include
that is automatically used if a module has C++ sources.
Change-Id: I4319d9260fcf9fb31c59c2f21ca64b536725d4f5
Yu Shan Emily Lau [Fri, 2 Jul 2010 01:34:43 +0000 (18:34 -0700)]
Add the support for the alarmManager and force the device to wake up.
Change-Id: Ib4a2f9cb580eadf6771b103399e14f932d50cb1c
Dianne Hackborn [Wed, 7 Jul 2010 16:04:08 +0000 (09:04 -0700)]
am
02215b36: Update to use new looper API.
Merge commit '
02215b36dde381f0b48ba51bfea405f5a6b01e46' into gingerbread-plus-aosp
* commit '
02215b36dde381f0b48ba51bfea405f5a6b01e46':
Update to use new looper API.
Dianne Hackborn [Sat, 3 Jul 2010 01:54:33 +0000 (18:54 -0700)]
Update to use new looper API.
Also need to put back the stub Java class for now, as the
build system still seems to require it.
Change-Id: I31917a1fc7c0bf8cd928969125f94d55c59d42f8
The Android Open Source Project [Fri, 2 Jul 2010 18:43:17 +0000 (11:43 -0700)]
merge from open-source master
Change-Id: I01fc38c3021027fcc3a3cea79b1c6564913caa9f
Christian Mehlmauer [Fri, 2 Jul 2010 14:20:49 +0000 (16:20 +0200)]
Cleaned up LunarLander sample
Change-Id: If2cc44c8312cebce170d07c34c64ea2ce1e5b7ab
Dianne Hackborn [Fri, 2 Jul 2010 02:36:18 +0000 (19:36 -0700)]
am
2c5db16b: Merge "Stub code no longer needed." into gingerbread
Merge commit '
2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c' into gingerbread-plus-aosp
* commit '
2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c':
Stub code no longer needed.
Dianne Hackborn [Fri, 2 Jul 2010 02:34:50 +0000 (19:34 -0700)]
Merge "Stub code no longer needed." into gingerbread
Dianne Hackborn [Fri, 2 Jul 2010 02:27:06 +0000 (19:27 -0700)]
Stub code no longer needed.
Change-Id: I985acdba1dd1c0acf00d88d2851b5f604475bf4c