Commit Graph

4609 Commits

Author SHA1 Message Date
David 'Digit' Turner
53c8d0614f Merge "ndk: Update platform system libraries." into gingerbread 2010-10-08 00:19:10 -07:00
Ying Wang
cbe0d5b963 resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463
2010-10-07 14:59:03 -07:00
Jeff Brown
3ec1cec3b7 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
2010-10-07 14:38:12 -07:00
Ying Wang
de14fbd4b1 Set monkey process name
So you can find it easily with "ps" or "top".

Change-Id: Id52cb8bb1680bd2cc24043d08a94f0a304f1e436
2010-10-07 13:04:24 -07:00
David 'Digit' Turner
7c5623becb 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
2010-10-07 11:17:39 +02:00
Anatol Pomazau
a3088c433e am 9f62c24a: Show \'Save tag\' dialog even if the screen is turned off
Merge commit '9f62c24a68e5408e5792fb185ab2e58d0c507265' into gingerbread-plus-aosp

* commit '9f62c24a68e5408e5792fb185ab2e58d0c507265':
  Show 'Save tag' dialog even if the screen is turned off
2010-10-05 17:50:43 -07:00
Anatol Pomazau
9f62c24a68 Show 'Save tag' dialog even if the screen is turned off
Change-Id: I7d8b2fa74525e81db1743bf3e4283778192fc047
2010-10-05 17:43:18 -07:00
Nick Kralevich
1ce3c1d4f7 am ce6bbfae: More data for testing.
Merge commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275' into gingerbread-plus-aosp

* commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275':
  More data for testing.
2010-10-05 16:48:56 -07:00
Anatol Pomazau
78823862e6 am 64076440: Dismiss "Save" dialog on activity stop
Merge commit '640764400347b35baa20089961560291b36e5840' into gingerbread-plus-aosp

* commit '640764400347b35baa20089961560291b36e5840':
  Dismiss "Save" dialog on activity stop
2010-10-05 16:44:04 -07:00
Nick Kralevich
ce6bbfae01 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
2010-10-05 16:42:51 -07:00
Anatol Pomazau
6407644003 Dismiss "Save" dialog on activity stop
Change-Id: I0e63b679c9677e50f7b5b6a20c9eb840f983aa18
2010-10-05 16:35:45 -07:00
Nick Kralevich
ad7ed96628 am 97d3699c: Have TagBroadcastReceiver start the SaveTag activity.
Merge commit '97d3699cd92e2c15623935d723f1b85ec673b73a' into gingerbread-plus-aosp

* commit '97d3699cd92e2c15623935d723f1b85ec673b73a':
  Have TagBroadcastReceiver start the SaveTag activity.
2010-10-05 15:44:33 -07:00
Nick Kralevich
97d3699cd9 Have TagBroadcastReceiver start the SaveTag activity.
Change-Id: I6dc8757ca7eec87efe622b0b2688dd29c5883185
2010-10-05 15:28:45 -07:00
Nick Kralevich
68220d5838 am afad3fa1: new icon.
Merge commit 'afad3fa14a102e1d38bbdcfc7d6dc70243f23ce7' into gingerbread-plus-aosp

* commit 'afad3fa14a102e1d38bbdcfc7d6dc70243f23ce7':
  new icon.
2010-10-05 13:13:51 -07:00
Nick Kralevich
afad3fa14a new icon.
Change-Id: I17751bbd0dc9d900002ef68ee51a4ddaf1600281
2010-10-05 12:44:50 -07:00
Nick Kralevich
4d5a6a6de3 am 08ad0fde: Merge "new SaveTag activity, additional utilities" into gingerbread
Merge commit '08ad0fde5ee365133b9ac1406767f2778b0c93ea' into gingerbread-plus-aosp

* commit '08ad0fde5ee365133b9ac1406767f2778b0c93ea':
  new SaveTag activity, additional utilities
2010-10-05 12:29:59 -07:00
Nick Kralevich
08ad0fde5e Merge "new SaveTag activity, additional utilities" into gingerbread 2010-10-05 12:22:20 -07:00
Dianne Hackborn
efddd2c5b2 am 8bcb38f3: Merge "New API demo showing different screen orientation options." into gingerbread
Merge commit '8bcb38f3d49d0fdefd51546ada4232203fc606cf' into gingerbread-plus-aosp

* commit '8bcb38f3d49d0fdefd51546ada4232203fc606cf':
  New API demo showing different screen orientation options.
2010-10-04 14:58:44 -07:00
Dianne Hackborn
8bcb38f3d4 Merge "New API demo showing different screen orientation options." into gingerbread 2010-10-04 14:53:33 -07:00
Nick Kralevich
41681e0be1 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
2010-10-04 09:34:39 -07:00
Dianne Hackborn
bf895af17d New API demo showing different screen orientation options.
Change-Id: I75b206f86ee87b50cccc5e23140d55bd566781cd
2010-10-02 16:56:56 -07:00
Nick Kralevich
12f3e97c7a am e97e78a0: Make unittests work, new TagBroadcastReceiver
Merge commit 'e97e78a0600e08b0e84edee96aea81145c0df44c' into gingerbread-plus-aosp

* commit 'e97e78a0600e08b0e84edee96aea81145c0df44c':
  Make unittests work, new TagBroadcastReceiver
2010-10-01 16:16:30 -07:00
Nick Kralevich
e97e78a060 Make unittests work, new TagBroadcastReceiver
Change-Id: I5a3a1938a7fb91c8114447d24427f2c263bda5a3
2010-10-01 16:09:03 -07:00
Brad Fitzpatrick
feebca8ba2 am 9c1a73ba: Update Monkey to new StrictMode API.
Merge commit '9c1a73ba8a6b6cee05f235ef71975c427a9f3a3c' into gingerbread-plus-aosp

* commit '9c1a73ba8a6b6cee05f235ef71975c427a9f3a3c':
  Update Monkey to new StrictMode API.
2010-10-01 13:07:42 -07:00
Nick Kralevich
00a7816b22 am 11e191b1: Merge "update required permissions." into gingerbread
Merge commit '11e191b197c97fe1512f6b630bac9a642eb2ffdb' into gingerbread-plus-aosp

* commit '11e191b197c97fe1512f6b630bac9a642eb2ffdb':
  update required permissions.
2010-10-01 10:48:35 -07:00
Ying Wang
58c636c9bc am 45550faa: Merge "Don\'t send non-existent system keys." into gingerbread
Merge commit '45550faad0f683d1393ea20144246ed43fc19899' into gingerbread-plus-aosp

* commit '45550faad0f683d1393ea20144246ed43fc19899':
  Don't send non-existent system keys.
2010-10-01 10:48:30 -07:00
Brad Fitzpatrick
9c1a73ba8a Update Monkey to new StrictMode API.
Change-Id: I0f2e90496c4dece8ee3766170d8a1fe2d22a7ff4
2010-10-01 10:48:01 -07:00
Jeff Brown
284e195427 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137
2010-10-01 10:42:11 -07:00
Nick Kralevich
11e191b197 Merge "update required permissions." into gingerbread 2010-10-01 09:44:27 -07:00
Ying Wang
45550faad0 Merge "Don't send non-existent system keys." into gingerbread 2010-10-01 09:42:13 -07:00
Nick Kralevich
4d68d883a5 update required permissions.
Change-Id: I49fb855c62aa1a11c8cbf7645aa4dbe2fa18faf3
2010-10-01 09:34:19 -07:00
Jeff Brown
4110368b93 Merge "Improve touch paint sample to use geometrical touch width." into gingerbread 2010-09-30 15:58:59 -07:00
Jeff Brown
fc1ee06369 Improve touch paint sample to use geometrical touch width.
Added multitouch support.
Fixed the trackball based drawing.

Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
2010-09-30 15:32:28 -07:00
Nick Kralevich
6a10d397f3 am c70ceb23: initial checkin. Needs lots of love.
Merge commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91' into gingerbread-plus-aosp

* commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91':
  initial checkin.  Needs lots of love.
2010-09-30 15:21:49 -07:00
Nick Kralevich
c70ceb2363 initial checkin. Needs lots of love.
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
2010-09-30 15:16:58 -07:00
Xavier Ducrohet
3975280e05 am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE
Merge commit '76afc004df452384cfd00137a59c7a3e0502ff75' into gingerbread-plus-aosp

* commit '76afc004df452384cfd00137a59c7a3e0502ff75':
  Integrate sdk.atree changes from master. DO NOT MERGE
2010-09-30 13:20:12 -07:00
Xavier Ducrohet
76afc004df Integrate sdk.atree changes from master. 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
2010-09-30 11:33:21 -07:00
Kenny Root
e575be05fd am 12c86756: Merge "Add OBB usage example" into gingerbread
Merge commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp

* commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
  Add OBB usage example
2010-09-30 10:09:11 -07:00
Xavier Ducrohet
92d47e4ef6 am 682ec293: Split the tools component from sdk.atree
Merge commit '682ec293359cf4ac8c61df25bb05519b604b17eb' into gingerbread-plus-aosp

* commit '682ec293359cf4ac8c61df25bb05519b604b17eb':
  Split the tools component from sdk.atree
2010-09-30 08:52:23 -07:00
Kenny Root
12c86756b9 Merge "Add OBB usage example" into gingerbread 2010-09-29 17:19:14 -07:00
Kenny Root
b9e80e74e2 Add OBB usage example
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
2010-09-29 16:18:08 -07:00
Ying Wang
5ee69f6f2c Don't send non-existent system keys.
Send only if the system key physically exists.

Change-Id: I8fa102db679c55e5bfba1c9a68ecf2bc196021cd
2010-09-29 13:23:56 -07:00
Eric Fischer
2ec45a5e5a am f4578730: Genericize strings with SD card references.
Merge commit 'f4578730bf95574f417fc2cee979bdc980cd02a8' into gingerbread-plus-aosp

* commit 'f4578730bf95574f417fc2cee979bdc980cd02a8':
  Genericize strings with SD card references.
2010-09-29 12:49:20 -07:00
Eric Fischer
f4578730bf Genericize strings with SD card references.
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
2010-09-29 10:56:20 -07:00
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
daa454cb3b am 64e53fe5: Merge "Move adb to the platform-tools."
Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp

* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
  Move adb to the platform-tools.
2010-09-27 16:44:55 -07:00
Raphael Moll
c0a2e0fc63 am 2f613967: Move adb to the platform-tools (windows SDK part).
Merge commit '2f613967a0c4a579370ff498c8461abee4978fc7' into gingerbread-plus-aosp

* commit '2f613967a0c4a579370ff498c8461abee4978fc7':
  Move adb to the platform-tools (windows SDK part).
2010-09-27 16:44:40 -07:00
Xavier Ducrohet
64e53fe5dd Merge "Move adb to the platform-tools." 2010-09-27 16:24:25 -07:00
Raphael Moll
2f613967a0 Move adb to the platform-tools (windows SDK part).
This is the Win SDK counterpart to Change I4c2a11c1.

Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
6a8e50f695 Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00