LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,283 Commits 2 Branches 0 Tags
678b7241cbdd894e98ece3454187f28748706f5c
Commit Graph

5283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Pomazau
4b96eff41c am 22ba58cf: Merge "Add a util function that converts Text ndef record to text." into gingerbread 
Merge commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1' into gingerbread-plus-aosp

* commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1':
  Add a util function that converts Text ndef record to text.
 2010-10-12 14:38:44 -07:00
Anatol Pomazau
22ba58cfb8 Merge "Add a util function that converts Text ndef record to text." into gingerbread 2010-10-12 14:36:09 -07:00
Anatol Pomazau
103f9c2257 Add a util function that converts Text ndef record to text. 
Add a unit test for it.

Change-Id: I5ce2020669150e3768a19354e951b6a54cc550d4
 2010-10-12 14:33:58 -07:00
Nick Kralevich
9c1791134f am e0890ff4: Explain the bytes associated with the NFC type 4 tag. 
Merge commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7' into gingerbread-plus-aosp

* commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7':
  Explain the bytes associated with the NFC type 4 tag.
 2010-10-12 14:02:31 -07:00
Nick Kralevich
e0890ff4bc Explain the bytes associated with the NFC type 4 tag. 
Change-Id: Ibe12a8cb94032f52e02ef28a423203483b1e096f
 2010-10-12 13:23:34 -07:00
Nick Kralevich
67007a4aeb am 62bb2dcc: change the tab selector icons 
Merge commit '62bb2dccdd9dcf223908c728e24460e8248a9e7a' into gingerbread-plus-aosp

* commit '62bb2dccdd9dcf223908c728e24460e8248a9e7a':
  change the tab selector icons
 2010-10-12 11:33:33 -07:00
Nick Kralevich
68c3b4fca6 am 21995b18: Add initial support for saved vs non-saved tags. 
Merge commit '21995b188899d9576ef8c5d26f0cc9e373804204' into gingerbread-plus-aosp

* commit '21995b188899d9576ef8c5d26f0cc9e373804204':
  Add initial support for saved vs non-saved tags.
 2010-10-12 11:23:49 -07:00
Nick Kralevich
abe92c127e am dbb9a2fd: Merge "cleanup unused classes, show date in tag list." into gingerbread 
Merge commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee' into gingerbread-plus-aosp

* commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee':
  cleanup unused classes, show date in tag list.
 2010-10-12 11:23:27 -07:00
David 'Digit' Turner
e68362e1d6 am 2e9b39e4: Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread 
Merge commit '2e9b39e457f1cf6794356144cad250c7fbe4e868' into gingerbread-plus-aosp

* commit '2e9b39e457f1cf6794356144cad250c7fbe4e868':
  ndk: Add missing OpenSLES headers and libraries.
 2010-10-12 11:23:21 -07:00
Nick Kralevich
62bb2dccdd change the tab selector icons 
Change-Id: Ia12adb2e72d6b8d444fd179970ed4b27a9fa3976
 2010-10-12 11:12:59 -07:00
Nick Kralevich
21995b1888 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
 2010-10-12 11:06:22 -07:00
Nick Kralevich
dbb9a2fd92 Merge "cleanup unused classes, show date in tag list." into gingerbread 2010-10-12 11:01:05 -07:00
David 'Digit' Turner
2e9b39e457 Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread 2010-10-12 10:31:53 -07:00
David 'Digit' Turner
51bcfb7110 ndk: Add missing OpenSLES headers and libraries. 
Change-Id: I5444f8701a2b8ad8e99fffc6906bad1bf101530f
 2010-10-12 18:29:00 +02:00
David 'Digit' Turner
47cacaf625 am b53e3cac: am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread 
Merge commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d'

* commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d':
  ndk: remove undefined symbols from system headers
 2010-10-11 18:59:22 -07:00
Kenny Root
d5e77d5e56 am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread 
Merge commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd' into gingerbread-plus-aosp

* commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd':
  Update OBB sample to revised API
 2010-10-11 17:31:13 -07:00
Nick Kralevich
8b2b6a1730 cleanup unused classes, show date in tag list. 
Change-Id: Ie9b1eee3606d7d1cfaff73723ff40c7570a6b1c9
 2010-10-11 17:28:21 -07:00
Kenny Root
3ceb9b53ea Merge "Update OBB sample to revised API" into gingerbread 2010-10-11 17:28:20 -07:00
Nick Kralevich
045e0767be am 4a74a386: get rid of sql finalizer error messages. 
Merge commit '4a74a386066d2eb86b64ffdf09391def0451e4be' into gingerbread-plus-aosp

* commit '4a74a386066d2eb86b64ffdf09391def0451e4be':
  get rid of sql finalizer error messages.
 2010-10-11 17:26:33 -07:00
Nick Kralevich
3cd1530903 am 55fe78df: bytes should be a blob. 
Merge commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58' into gingerbread-plus-aosp

* commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58':
  bytes should be a blob.
 2010-10-11 17:25:55 -07:00
Kenny Root
a2f69539af Update OBB sample to revised API 
Change-Id: Idc724170a9cbb6a94523b406b8a1f91fcf8293a4
 2010-10-11 17:25:23 -07:00
Brett Chabot
a2e81242e0 Add utility for toggling settings from the cmd line. 
Change-Id: I4dc7052c22fac3edf66e2d7db0c8d7039be4f196
 2010-10-11 16:25:03 -07:00
Nick Kralevich
4a74a38606 get rid of sql finalizer error messages. 
Change-Id: I5613734b78f861237b435079742528b9623c97de
 2010-10-11 16:10:04 -07:00
Nick Kralevich
55fe78df44 bytes should be a blob. 
Change-Id: I8bbf6aab8ec67d60cb6ac47cd273aec8814d2d6a
 2010-10-11 15:22:58 -07:00
Joe Malin
390d67679c Samples: Fix bugs in Note Pad sample app. 
Change-Id: I859cbc73eaaa77a9ff89484f33c7150d76a4e2c2
 2010-10-11 09:13:32 -07:00
David 'Digit' Turner
b53e3cac40 am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread 
Merge commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3' into gingerbread-plus-aosp

* commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3':
  ndk: remove undefined symbols from system headers
 2010-10-11 06:11:48 -07:00
David 'Digit' Turner
3c72deb3f4 Merge "ndk: remove undefined symbols from system headers" into gingerbread 2010-10-11 06:02:15 -07:00
Raphael
3fe7e69b2d am f838e2f4: am 59b02d0e: Update win_sdk to put binaries in SDK/platform-tools. 
Merge commit 'f838e2f4e1d18b9a24fd9e6d524ce4c87e38fde4'

* commit 'f838e2f4e1d18b9a24fd9e6d524ce4c87e38fde4':
  Update win_sdk to put binaries in SDK/platform-tools.
 2010-10-10 19:14:18 -07:00
Jean-Baptiste Queru
a4d6fb3907 am 4ceead6b: am e73f0dfc: Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd." 
Merge commit '4ceead6ba01a938499726809c90154cb0e8c1e22'

* commit '4ceead6ba01a938499726809c90154cb0e8c1e22':
  Added adb_interface.WaitForProcess and WaitForProcessEnd.
 2010-10-10 17:46:49 -07:00
Jeff Brown
2559781424 am 7afd3a56: am 028c4032: Merge "Update NDK with recent changes." into gingerbread 
Merge commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2'

* commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2':
  Update NDK with recent changes.
 2010-10-10 17:45:41 -07:00
David 'Digit' Turner
baeabf2475 am 5a3dbcee: am 53c8d061: Merge "ndk: Update platform system libraries." into gingerbread 
Merge commit '5a3dbceeb452487ef9328978140c07c4fc596291'

* commit '5a3dbceeb452487ef9328978140c07c4fc596291':
  ndk: Update platform system libraries.
 2010-10-10 14:22:14 -07:00
Bill Napier
85c3f8e126 Add in MonkeyRunner to the Windows SDK. 
Change-Id: Iecb23b5a2f790978246df9ab4a10cda884abf742
 2010-10-10 13:34:38 -07:00
Ying Wang
14c0c1e4a0 am cbe0d5b9: resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp 
Merge commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd'

* commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd':
  Set monkey process name
 2010-10-10 12:49:17 -07:00
Raphael
f838e2f4e1 am 59b02d0e: Update win_sdk to put binaries in SDK/platform-tools. 
Merge commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5' into gingerbread-plus-aosp

* commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5':
  Update win_sdk to put binaries in SDK/platform-tools.
 2010-10-08 16:23:37 -07:00
Raphael
59b02d0eff Update win_sdk to put binaries in SDK/platform-tools. 
Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
 2010-10-08 15:41:01 -07:00
Jean-Baptiste Queru
4ceead6ba0 am e73f0dfc: Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd." 
Merge commit 'e73f0dfc64a55dcdcac92a2cab93de677042fb07' into gingerbread-plus-aosp

* commit 'e73f0dfc64a55dcdcac92a2cab93de677042fb07':
  Added adb_interface.WaitForProcess and WaitForProcessEnd.
 2010-10-08 13:52:24 -07:00
Jean-Baptiste Queru
e73f0dfc64 Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd." 2010-10-08 13:43:42 -07:00
Jeff Brown
7afd3a56c5 am 028c4032: Merge "Update NDK with recent changes." into gingerbread 
Merge commit '028c403286aa08c7edb4b822e68121c694f52693' into gingerbread-plus-aosp

* commit '028c403286aa08c7edb4b822e68121c694f52693':
  Update NDK with recent changes.
 2010-10-08 12:51:02 -07:00
Jeff Brown
028c403286 Merge "Update NDK with recent changes." into gingerbread 2010-10-08 12:45:05 -07:00
Patrick Scott
ed149c2dff Fix for building the sim on glucid. 
Change-Id: I7c9df36c02591baa45bffb2da8e885813a3e3d86

Revert "Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are"

This reverts commit fe524684fb.
 2010-10-08 13:07:41 -04:00
David 'Digit' Turner
7c2ba504e9 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.
 2010-10-08 17:07:39 +02:00
David 'Digit' Turner
5a3dbceeb4 am 53c8d061: Merge "ndk: Update platform system libraries." into gingerbread 
Merge commit '53c8d0614f60ed488e9993d2dd0c6b5a0e49a2d0' into gingerbread-plus-aosp

* commit '53c8d0614f60ed488e9993d2dd0c6b5a0e49a2d0':
  ndk: Update platform system libraries.
 2010-10-08 00:22:08 -07:00
David 'Digit' Turner
53c8d0614f Merge "ndk: Update platform system libraries." into gingerbread 2010-10-08 00:19:10 -07:00
Anatol Pomazau
0bb3e5ef33 am a3088c43: am 9f62c24a: Show \'Save tag\' dialog even if the screen is turned off 
Merge commit 'a3088c433ed5deb775d390f2b22df40dc0194950'

* commit 'a3088c433ed5deb775d390f2b22df40dc0194950':
  Show 'Save tag' dialog even if the screen is turned off
 2010-10-07 15:15:26 -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
Chet Haase
824bec0f9c Merge "Various fixes" 2010-10-07 13:18:52 -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
Chet Haase
45d18599b8 Various fixes 
Change-Id: I70509d19d1df01e998de4804bc7c1e1899ad8dee
 2010-10-07 12:29:12 -07:00
Nick Kralevich
f5320adb18 am 1ce3c1d4: am ce6bbfae: More data for testing. 
Merge commit '1ce3c1d4f75985edf490719bed33f583d74c4410'

* commit '1ce3c1d4f75985edf490719bed33f583d74c4410':
  More data for testing.
 2010-10-07 12:23:23 -07:00