Commit Graph

5283 Commits

Author SHA1 Message Date
Anatol Pomazau
8fa797a472 am 78823862: am 64076440: Dismiss "Save" dialog on activity stop
Merge commit '78823862e69b65e999b221053076cafc099133e0'

* commit '78823862e69b65e999b221053076cafc099133e0':
  Dismiss "Save" dialog on activity stop
2010-10-07 12:23:06 -07:00
Nick Kralevich
2bb58e9f26 am ad7ed966: am 97d3699c: Have TagBroadcastReceiver start the SaveTag activity.
Merge commit 'ad7ed9662874ca57e9a17d334f973fada634654f'

* commit 'ad7ed9662874ca57e9a17d334f973fada634654f':
  Have TagBroadcastReceiver start the SaveTag activity.
2010-10-07 12:22:24 -07:00
Nick Kralevich
63eda94346 am 68220d58: am afad3fa1: new icon.
Merge commit '68220d5838c2039d6b1279587e4a2a45496c6f3a'

* commit '68220d5838c2039d6b1279587e4a2a45496c6f3a':
  new icon.
2010-10-07 12:19:53 -07:00
Nick Kralevich
f3d2517c05 am 4d5a6a6d: am 08ad0fde: Merge "new SaveTag activity, additional utilities" into gingerbread
Merge commit '4d5a6a6de3d86007d68a590d3893489cd740d179'

* commit '4d5a6a6de3d86007d68a590d3893489cd740d179':
  new SaveTag activity, additional utilities
2010-10-07 09:27:43 -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
Marco Nelissen
c9448802a7 Merge "froyo == honeycomb" 2010-10-06 16:04:05 -07:00
Marco Nelissen
08cbad2818 Merge "Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are not present (anymore?) in the wx2.6 .so, but gcc wants to use the exported functions instead of inlining them. Comment them out for now." 2010-10-06 16:03:56 -07:00
Marco Nelissen
47017b3b7f froyo == honeycomb
Change-Id: I449dfa5815b2a07237d2717f054755dc7edb7b82
2010-10-06 13:24:23 -07:00
Marco Nelissen
fe524684fb Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are
not present (anymore?) in the wx2.6 .so, but gcc wants to use the
exported functions instead of inlining them. Comment them out for now.

Change-Id: I1b2385c48c77e23f9885f79092f69795a41afd8f
2010-10-06 13:20:12 -07:00
Dianne Hackborn
7d0913cdc2 Merge "Make note pad provider private, but able to grant URI permissions." 2010-10-05 17:55:25 -07: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
Robert Greenwalt
5b72ed24c3 Merge "Add testing features to devtools" 2010-10-05 15:23:36 -07:00
Dianne Hackborn
0ada5c781f Make note pad provider private, but able to grant URI permissions.
Change-Id: I6113ec86e4d4cbc105932067ac2fbb2a0d468e15
2010-10-05 14:09:05 -07:00
Dianne Hackborn
ee3433bc58 resolved conflicts for merge of efddd2c5 to master
Change-Id: Ida5785a4b936ed485ee6f895cbe994acf5b37626
2010-10-05 14:06:01 -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
Robert Greenwalt
40f7d44cac Add testing features to devtools
Fixed manifest with missing permission.
Added some connectivity api-tweakers

Change-Id: I10007938e28e8c0f550ae78a7cd6df4a817a8800
2010-10-05 12:12:18 -07:00
Chet Haase
7da3f9f51e Modfied demo to show setting animations to null
Originally, setting LayoutTransition animators to null just restored the default animation behavior, It seems more sensible to have null actually disable the animation. I made that change to the framework and modified this demo to show how it's done. Along the way, I refactored the code a bit and fixed some minor bugs.

Change-Id: Icfb53ada234b635294c5faa68a15932f25859fb8
2010-10-04 17:25:41 -07:00
Chet Haase
2a06483139 Demos for show/hide layout transitions
Change-Id: Idb7ecb66b7dc0126a230385dd09af6a9208d5345
2010-10-04 15:19:26 -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
6f6a7107ac am 12f3e97c: am e97e78a0: Make unittests work, new TagBroadcastReceiver
Merge commit '12f3e97c7a011cab7b13caeff308da380a62f6b8'

* commit '12f3e97c7a011cab7b13caeff308da380a62f6b8':
  Make unittests work, new TagBroadcastReceiver
2010-10-01 17:08:23 -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
4006b3e9fa am feebca8b: am 9c1a73ba: Update Monkey to new StrictMode API.
Merge commit 'feebca8ba24c3aedaf667d0db6fb17e36d441328'

* commit 'feebca8ba24c3aedaf667d0db6fb17e36d441328':
  Update Monkey to new StrictMode API.
2010-10-01 14:18:42 -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
07505f0214 am 00a7816b: am 11e191b1: Merge "update required permissions." into gingerbread
Merge commit '00a7816b2231a0b8154060100671db33f33dc777'

* commit '00a7816b2231a0b8154060100671db33f33dc777':
  update required permissions.
2010-10-01 10:52:14 -07:00
Ying Wang
9cf3f0a73e am 58c636c9: am 45550faa: Merge "Don\'t send non-existent system keys." into gingerbread
Merge commit '58c636c9bce624b8cdd33c910d4eb39b856a520d'

* commit '58c636c9bce624b8cdd33c910d4eb39b856a520d':
  Don't send non-existent system keys.
2010-10-01 10:52:12 -07:00
Jeff Brown
88603b1881 am 284e1954: resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
Merge commit '284e1954274b708f3cf60ab82cdabe0f4c31d141'

* commit '284e1954274b708f3cf60ab82cdabe0f4c31d141':
2010-10-01 10:49:58 -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
Nick Kralevich
ecf11ceb60 am 6a10d397: am c70ceb23: initial checkin. Needs lots of love.
Merge commit '6a10d397f311f7816d29e9879eb1c020b8863821'

* commit '6a10d397f311f7816d29e9879eb1c020b8863821':
2010-09-30 18:11:32 -07:00
Jeff Brown
cc633e4965 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b
2010-09-30 16:39:16 -07:00
Xavier Ducrohet
77fdd16cf3 am 3975280e: (-s ours) am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE
Merge commit '3975280e0583d45de4708375622b22019a0df9f5'

* commit '3975280e0583d45de4708375622b22019a0df9f5':
  Integrate sdk.atree changes from master. DO NOT MERGE
2010-09-30 16:00:51 -07:00