drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,681 Commits 1 Branch 0 Tags
Commit Graph

43681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
861a9c7108 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
e7662123f2 am 7a69ffa0: am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '7a69ffa0e455cfb990b53d9dffa3b76c590dea0e':
  Fix build - javadoc.
 2011-01-29 08:35:53 -08:00
Scott Main
6857be3a2d 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
16e52bcbdf 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
7a69ffa0e4 am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
  Fix build - javadoc.
 2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
34ebb5bfec 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
213705e37b 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
88d7300d2a 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
87d197597c Delete browerplugin tests - do not merge 
Those don't build in all environments.

Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
 2011-01-29 07:41:39 -08:00
Jean-Baptiste Queru
d4c8cec094 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
8b10bdb494 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
7d4b7dab39 Merge 55e124c4 from gingerbread-plus-aosp 
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
 2011-01-29 07:32:39 -08:00
Andreas Huber
d7e5669409 am efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder 
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
 2011-01-29 07:30:57 -08:00
Justin Ho
4379dac6b0 am 28c4f69a: Updated checkbox assets 
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
 2011-01-29 07:30:39 -08:00
Arnaud Ferir
c5e35fd246 am 5e81a6e2: Fix trace mismatch. 
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
 2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
addd46c658 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. 
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
 2011-01-29 07:29:56 -08:00
John Wang
6630698e24 am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread 
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
 2011-01-29 07:29:42 -08:00
Jean-Baptiste Queru
86e1c5b9f6 Merge c896d85c from gingerbread 
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
 2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6 Merge da01b4ab from gingerbread 
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
 2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
 2011-01-29 07:09:21 -08:00
Jim Miller
4485edce05 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-29 07:08:58 -08:00
Robert Greenwalt
aa3866e6fa 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
d84ac204f4 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
b79c611ebf 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
6b739dc729 Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Robert Greenwalt
19eecb028f Merge "Don't use mobile networktype icon if not connected" into honeycomb 2011-01-29 06:35:57 -08:00
Justin Ho
cf5c0741e7 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
a5e92d18b0 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
9b1df1646f 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
35326b876e Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style 
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
 2011-01-28 22:49:43 -08:00
Jeff Brown
2992ea782f Add "Use physical keyboard" option to system bar IME button. 
Bug: 3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
 2011-01-28 22:06:36 -08:00
Justin Ho
f6b16886b0 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
ab865ba773 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
9371f70300 Merge "New honeycomb sound set" into honeycomb 2011-01-28 19:18:51 -08:00
Justin Ho
5f3bbcf554 New honeycomb sound set 
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
 2011-01-28 19:15:23 -08:00
Joe Onorato
5be5f51c2e am 7f51171a: am a0f2cdb5: Merge "999" into honeycomb 
* commit '7f51171ab3afebe9e9695c0991c579bc959a180d':
  999
 2011-01-28 18:52:26 -08:00
Joe Onorato
7f51171ab3 am a0f2cdb5: Merge "999" into honeycomb 
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
  999
 2011-01-28 18:50:03 -08:00
Joe Onorato
a0f2cdb507 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684 999 
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
 2011-01-28 18:46:20 -08:00
Jaikumar Ganesh
e741e5400e am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
  Do Not Merge Connect other profiles when priority is auto connect.
 2011-01-28 18:45:14 -08:00
John Reck
4d03f646b4 am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread 
* commit '398a589ccea744556732b25097412dbb22c51271':
  DO NOT MERGE - Create db path if it doesn't exit
 2011-01-28 18:44:57 -08:00
Mathias Agopian
694f3e9cff 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
Jeff Hamilton
df5d015ae2 resolved conflicts for merge of dc54a8c7 to honeycomb-merge 
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
 2011-01-28 20:41:42 -06:00
Mathias Agopian
8d778b375c 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
231da079c9 Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 2011-01-28 18:38:58 -08:00
Mathias Agopian
1723b049c6 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
d649618814 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
Christopher Tate
9805d8e081 Merge "Enable global (cross-application) drag/drop" 2011-01-28 18:01:56 -08:00
Jason Sams
b142f099d8 am 359113b4: (-s ours) am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb 
* commit '359113b42ee691749dfe717bb0ead5358045e615':
  DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
 2011-01-28 18:00:46 -08:00
Jason Sams
a66b759ab0 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 'bd08c7c0c99fa84dbf3c043f4e6dff07320410b7':
  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:00:09 -08:00