ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
29,221 Commits 2 Branches 0 Tags 54 MiB
17d8836670
Commit Graph

29221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
17d8836670 am f163b4d3: am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype. 
* commit 'f163b4d3318d3cedd1ef633ae45ab6b822c1d24f':
  Fix a bug that IME switch disappiers at switching IME subtype.
 2011-01-29 09:53:34 -08:00
satok
6784e8dac3 am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype. 
* commit 'e40dea0d06ec1c04db80191fd2965363b4fac781':
  Fix a bug that IME switch disappiers at switching IME subtype.
 2011-01-29 09:50:03 -08:00
Jean-Baptiste Queru
9d6a368bda am d9e6bda6: (-s ours) am 34ebb5bf: (-s ours) am 87d19759: Delete browerplugin tests - do not merge 
* commit 'd9e6bda6b9d12f002345c8e45cf3a94c3500851a':
  Delete browerplugin tests - do not merge
 2011-01-29 09:37:46 -08:00
Jean-Baptiste Queru
113843be82 am 6ace65d2: (-s ours) am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '6ace65d25f5d004117c27f45dbf4499b82581470':
  Delete browerplugin tests - do not merge
 2011-01-29 09:37:38 -08:00
Jean-Baptiste Queru
6451d02517 am 34ebb5bf: (-s ours) am 87d19759: Delete browerplugin tests - do not merge 
* commit '34ebb5bfec0794d5852b47edaa8b9d4cea22e515':
  Delete browerplugin tests - do not merge
 2011-01-29 09:36:02 -08:00
Jean-Baptiste Queru
8f767cf93c am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '88d7300d2abaf638c2c0b5505b657b401f881c14':
  Delete browerplugin tests - do not merge
 2011-01-29 09:35:55 -08:00
Robert Greenwalt
df56500e29 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.
 2011-01-29 09:35:28 -08:00
Robert Greenwalt
e0b71f1446 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Eric Fischer
ae438374cf am a0e51ef2: (-s ours) am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'a0e51ef2a4d5d16ed68b360851c5428b17e75eb4':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:18:14 -08:00
Eric Fischer
a7d6b7e4b2 am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:13:21 -08:00
Dirk Dougherty
82f4900150 am 51bae7e7: am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit '51bae7e74aa63b2ff455631c5b7954cfa1927b2f':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-29 09:00:41 -08:00
Andreas Huber
728736c8dc am c2bee3ae: (-s ours) am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit 'c2bee3ae2d6cebdaf588a102ff64499717e43cc7':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-29 09:00:38 -08:00
Jean-Baptiste Queru
848c3ac12c am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp 
* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
  Fix issue 2988031.
 2011-01-29 08:57:47 -08:00
Dirk Dougherty
7b61263cfe am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit '30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-29 08:57:25 -08:00
Andreas Huber
300d37d2b8 am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit '70888c00a0371692a07132f0dd94208456dd44c1':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-29 08:57:21 -08:00
Jean-Baptiste Queru
21e81dddc6 Merge 13212f83 from gingerbread-plus-aosp 
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
 2011-01-29 08:54:06 -08:00
Jim Miller
63ffa6ed0a am 4876c29f: (-s ours) am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '4876c29f48dda11a2fd13d9a61050783565e7595':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 08:53:01 -08:00
Jean-Baptiste Queru
9910e236d0 am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp 
* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
  API: Make close() throw an IOException.
 2011-01-29 08:50:38 -08:00
Jim Miller
f181cf3c14 am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '145643ca4bb98a88977026ea4d7866e391d53dce':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 08:47:55 -08:00
Jean-Baptiste Queru
2e84762231 Merge 34afc2cd from gingerbread-plus-aosp 
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
 2011-01-29 08:45:29 -08:00
Eric Fischer
cc40bc21f7 am 16e52bcb: (-s ours) am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '16e52bcbdf11c7411be683efabddf7080c54ffd2':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:35:58 -08:00
Nick Pelly
f7036b1e61 am 7a69ffa0: am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '7a69ffa0e455cfb990b53d9dffa3b76c590dea0e':
  Fix build - javadoc.
 2011-01-29 08:35:53 -08:00
Scott Main
70b70aeeea am 213705e3: am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '213705e37be670552ff30892b2e60f7b8d279a7e':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-29 08:02:26 -08:00
Eric Fischer
5027c29088 am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'e49e30cc4d9411326735f15d92e8d7455467072f':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:02:19 -08:00
Nick Pelly
8beb0a0866 am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
  Fix build - javadoc.
 2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
2409f6b6b0 am 87d19759: Delete browerplugin tests - do not merge 
* commit '87d197597c9130b10ba9d67f17ed81db26e35cd8':
  Delete browerplugin tests - do not merge
 2011-01-29 08:00:52 -08:00
Scott Main
c85b7581f1 am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '51330184feb1b8d01ac48f4f13e4b91e7e334401':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-29 07:59:28 -08:00
Jean-Baptiste Queru
c461fbc452 am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit 'd4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
  Delete browerplugin tests - do not merge
 2011-01-29 07:58:36 -08:00
Jean-Baptiste Queru
2512def16d am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '9720323a5138acafbe30da38d61eeac469b675a4':
  Delete browerplugin tests - do not merge
 2011-01-29 07:39:47 -08:00
Jean-Baptiste Queru
45315d5004 am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aosp 
* commit '7d4b7dab397fb780873303d60650bf0a0557cf41':
  Clean up MifareUltralight API.
 2011-01-29 07:38:41 -08:00
Jean-Baptiste Queru
ffdc0440ec Merge 55e124c4 from gingerbread-plus-aosp 
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
 2011-01-29 07:32:39 -08:00
Robert Greenwalt
5184bce8ae am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread 
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
 2011-01-29 06:55:38 -08:00
Robert Greenwalt
2d9e376693 am b79c611e: am 19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb 
* commit 'b79c611ebf16b7b03273e0a0bdac09181e50a12e':
  Don't use mobile networktype icon if not connected
 2011-01-29 06:53:07 -08:00
Robert Greenwalt
6835f6094b am 19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb 
* commit '19eecb028fe094e5f41d9ddeb1e6aac1d096da43':
  Don't use mobile networktype icon if not connected
 2011-01-29 06:44:35 -08:00
Robert Greenwalt
62e5b62d7f Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Robert Greenwalt
1fc7c8ff4b Merge "Don't use mobile networktype icon if not connected" into honeycomb 2011-01-29 06:35:57 -08:00
Justin Ho
80f152c603 am a5e92d18: am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 
* commit 'a5e92d18b045bdf71c0445d34b2bfa775c582ab6':
  Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
 2011-01-28 22:55:41 -08:00
Justin Ho
631d53fd1c am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 
* commit '9b1df1646ff4d480eebe2fd9cd394915b7925e92':
  Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
 2011-01-28 22:54:11 -08:00
Justin Ho
d453b0cbbf Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 2011-01-28 22:51:51 -08:00
Justin Ho
b0a55663eb am ab865ba7: am 9371f703: Merge "New honeycomb sound set" into honeycomb 
* commit 'ab865ba7735264afde777842b1b9946686521357':
  New honeycomb sound set
 2011-01-28 19:24:10 -08:00
Justin Ho
00ee7ba7d7 am 9371f703: Merge "New honeycomb sound set" into honeycomb 
* commit '9371f7030011da2bcc45587e59a40a498f92dfb4':
  New honeycomb sound set
 2011-01-28 19:21:33 -08:00
Justin Ho
74c7bb3ccc Merge "New honeycomb sound set" into honeycomb 2011-01-28 19:18:51 -08:00
Joe Onorato
b4514292af am 7f51171a: am a0f2cdb5: Merge "999" into honeycomb 
* commit '7f51171ab3afebe9e9695c0991c579bc959a180d':
  999
 2011-01-28 18:52:26 -08:00
Joe Onorato
33f49254b5 am a0f2cdb5: Merge "999" into honeycomb 
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
  999
 2011-01-28 18:50:03 -08:00
Joe Onorato
67e95b1960 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Mathias Agopian
3cbe436bfd am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 
* commit '8d778b375ccb4945cdcd7cc93272a6d36466ad00':
  fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
 2011-01-28 18:43:08 -08:00
Mathias Agopian
daabd7c228 am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 
* commit '231da079c93664fa7d81c7e957990f17a6334b17':
  fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
 2011-01-28 18:40:44 -08:00
Mathias Agopian
779160c4ea Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 2011-01-28 18:38:58 -08:00
Mathias Agopian
3cc2677efc fix [3389263] OMX.Nvidia.h264.decode fails to shutdown 
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.

Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
 2011-01-28 18:23:24 -08:00
Jason Sams
2948e3b340 am a66b759a: am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb 
* commit 'a66b759ab01c7f1e334d7b9a9f7d78ce3b45ff1c':
  Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
 2011-01-28 18:02:57 -08:00