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

34658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
d7d3ad477c Fix for text selection at end of line. 
Bug 3106935

Change-Id: Ieee7f50385baae359db45472ffc800a01956cb40
 2010-10-18 13:20:53 -07:00
Joe Onorato
5747eebf6e am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 
Merge commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42' into gingerbread-plus-aosp

* commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42':
  Pressing the power button quickly needs to turn the screen on and off correctly.
 2010-10-18 13:16:42 -07:00
Joe Onorato
a8d477f0d7 Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 2010-10-18 13:14:16 -07:00
Joe Onorato
3d3db601cd Pressing the power button quickly needs to turn the screen on and off correctly. 
This does the animation with the power manager lock held, which isn't great, but is safe.

Bug: 3102208
Change-Id: Ib0af3fab1cf6ba47053c10ae8b701376d63802ff
 2010-10-18 16:08:16 -04:00
Dirk Dougherty
75ceb8d9db Doc change: escape angle brackets in javadoc comment. 
Change-Id: Iad525e3575bc8e8cd65c7127b45a56a6fb56245d
 2010-10-18 13:07:55 -07:00
Kenny Root
027610a76e resolved conflicts for merge of 964eb438 to master 
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
 2010-10-18 13:03:35 -07:00
Stephen Hines
afb05db237 Merge "Adding new unit test for rsDebug()." 2010-10-18 12:27:54 -07:00
Steve Block
16b8bf0793 Merge changes I4a85ff69,Idba4acc2 
* changes:
  Fix DumpRenderTree2 script to allow only one path to be specified
  Improve error handling in DumpRenderTree2 scripts
 2010-10-18 12:23:28 -07:00
Steve Block
24652bc958 Fix DumpRenderTree2 to correctly handle crashed tests 
Change-Id: I894987d5b8f24ea31893aefe3cb6450c2736aa90
 2010-10-18 20:20:43 +01:00
Steve Block
fc16915d32 Fix DumpRenderTree2 script to allow only one path to be specified 
Change-Id: I4a85ff69554a9c76af0b2deea747b8414660fee2
 2010-10-18 20:20:42 +01:00
Steve Block
ae47ce0046 Improve error handling in DumpRenderTree2 scripts 
Change-Id: Idba4acc22dd037a001ea5c05cbd6a29292f6de2c
 2010-10-18 20:20:41 +01:00
Stephen Hines
e2a26e155b Adding new unit test for rsDebug(). 
Change-Id: I8a354e40640b83aca3148aa0cf13d3335ff37dd4
 2010-10-18 12:17:03 -07:00
Nick Pelly
c2e4daacb4 am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.
 2010-10-18 12:04:16 -07:00
Nick Pelly
1f90908c19 Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 2010-10-18 12:00:48 -07:00
Nick Pelly
fdf9086e24 Prevent use of NFC api if device is not featurized for NFC. 
Change-Id: I8724cb947223b7b60814d0be51e1122123ebb98a
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-18 11:52:28 -07:00
Andreas Huber
9b2f18df24 am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 
Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp

* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
  For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
 2010-10-18 11:50:19 -07:00
Ying Wang
ec62719c83 am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread 
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp

* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
  Link against the static libcrypto in external/openssl.
 2010-10-18 11:50:08 -07:00
Andreas Huber
bc96c2848d Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 2010-10-18 11:46:44 -07:00
Stephen Hines
2cd6f4709c Merge "Add support for rsDebug with 64-bit types." 2010-10-18 11:45:16 -07:00
Ying Wang
004f968d0c Merge "Link against the static libcrypto in external/openssl." into gingerbread 2010-10-18 11:44:28 -07:00
Adam Powell
a6fdc38b24 Merge "Hide ButtonGroup - not ready for public consumption." 2010-10-18 11:42:20 -07:00
Andreas Huber
8f5214eb6f am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread 
Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp

* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
  If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
 2010-10-18 11:24:05 -07:00
Andreas Huber
02ec432e6e Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread 2010-10-18 11:18:11 -07:00
Adam Powell
0cd8122f75 Hide ButtonGroup - not ready for public consumption. 
Change-Id: I9afeac135c1d7a6115789ed2a2f43ad9aa9d4fcf
 2010-10-18 11:11:19 -07:00
Steve Block
1f696ffcdd Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager" 2010-10-18 10:40:47 -07:00
Andreas Huber
99bc1da79b If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs. 
Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
 2010-10-18 10:39:29 -07:00
Romain Guy
65202242de am 157fa0ac: am 77c011ba: Set default heap size to 5MB. 
Merge commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb'

* commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb':
  Set default heap size to 5MB.
 2010-10-18 10:33:17 -07:00
Eric Laurent
dd70133ceb am 1a326022: am 208bb08a: Merge "Fix issue 3098880." into gingerbread 
Merge commit '1a32602212bad146990418094b0ffcab05c5eb7b'

* commit '1a32602212bad146990418094b0ffcab05c5eb7b':
  Fix issue 3098880.
 2010-10-18 10:32:05 -07:00
Nick Kralevich
1012f1f148 am 21059b63: am 5e7b7cd6: Merge "range checking for tnf" into gingerbread 
Merge commit '21059b637c30cbecbc4eb7e69481a5e582d0ba2b'

* commit '21059b637c30cbecbc4eb7e69481a5e582d0ba2b':
  range checking for tnf
 2010-10-18 10:31:58 -07:00
Kenny Root
46d2116125 am 097ea0bb: (-s ours) am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread 
Merge commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43'

* commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43':
  Import revised translations DO NOT MERGE
 2010-10-18 10:31:51 -07:00
Jeff Brown
195226a3c8 am 9e0e0543: am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread 
Merge commit '9e0e054388689fd618c84a283c28ee484477b44d'

* commit '9e0e054388689fd618c84a283c28ee484477b44d':
  Fix a native crash in input dispatcher when windows are removed.
 2010-10-18 10:31:43 -07:00
Jeff Brown
d21de4b921 am 6ba052b4: (-s ours) am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread 
Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b'

* commit '6ba052b4847d85831c38c9b8e2942cef4987e55b':
  Add support for secure system overlays.  (DO NOT MERGE)
 2010-10-18 10:31:38 -07:00
Justin Ho
1a2c6089f8 am bce520e6: (-s ours) am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread 
Merge commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4'

* commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
 2010-10-18 10:31:25 -07:00
Gilles Debunne
6775754ae3 am 3d01cb93: Merge "Removed "Select word" option on password fields." into gingerbread 
Merge commit '3d01cb934ba2c5161689834d49f520313e554571' into gingerbread-plus-aosp

* commit '3d01cb934ba2c5161689834d49f520313e554571':
  Removed "Select word" option on password fields.
 2010-10-18 10:26:50 -07:00
Ben Murdoch
06ff27f0cb am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp

* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
  Add the HTML5Audio class, to support the audio tag.
 2010-10-18 10:26:43 -07:00
Nick Pelly
6b09a90a81 am e47150e9: Fix up NFC permissions. 
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
 2010-10-18 10:26:12 -07:00
Gilles Debunne
3d01cb934b Merge "Removed "Select word" option on password fields." into gingerbread 2010-10-18 10:16:13 -07:00
Andreas Huber
5a40e394f1 For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. 
related-to-bug: 3106534
Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
 2010-10-18 10:16:08 -07:00
Ben Murdoch
83366dfb96 Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 2010-10-18 10:15:55 -07:00
Nick Pelly
e47150e933 Fix up NFC permissions. 
The initial (vendor) implementation had 4 perms, replace with 1.

Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.

Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())

Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-18 10:04:40 -07:00
Scott Main
5bb9e621e1 am 20856f71: am c9f7890a: Revise some javadocs for NFC; add package description 
Merge commit '20856f71d971a85a25307941055fb9543adcdc68'

* commit '20856f71d971a85a25307941055fb9543adcdc68':
  Revise some javadocs for NFC; add package description
 2010-10-18 09:31:09 -07:00
Shimeng (Simon) Wang
246d8b7d15 am 53820a96: (-s ours) am 7ef6834e: Merge "DO NOT MERGE" into gingerbread 
Merge commit '53820a9694a8f3c6564edb6caf90350e96b57567'

* commit '53820a9694a8f3c6564edb6caf90350e96b57567':
  DO NOT MERGE
 2010-10-18 09:30:57 -07:00
Jean-Baptiste Queru
613ef2efa3 Fix build (bad merge) 
Bug: 3101573
Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
 2010-10-18 08:47:03 -07:00
Jean-Baptiste Queru
ac2a88061d Remove one more opencore include path 
Bug: 3101573
Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
 2010-10-18 08:41:14 -07:00
Jean-Baptiste Queru
5582cc3a68 Merge fb474872 from gingerbread-plus-aosp 
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
 2010-10-18 08:33:38 -07:00
Andreas Huber
5b9fd116f9 am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread 
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'

* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
  Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
 2010-10-18 08:05:09 -07:00
Dianne Hackborn
875ecaa511 am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'

* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
 2010-10-18 08:04:47 -07:00
Irfan Sheriff
dab540e6f8 am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread 
Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb'

* commit 'cf66f587514a935c290c8c9558243a48ba0243eb':
  fix build DO NOT MERGE
 2010-10-18 08:04:35 -07:00
Justin Ho
f58546da65 am e35cd5f5: (-s ours) am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread 
Merge commit 'e35cd5f569fe760385198f485e4610ad13033dd3'

* commit 'e35cd5f569fe760385198f485e4610ad13033dd3':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
 2010-10-18 08:04:28 -07:00
Shimeng (Simon) Wang
8b1373fbed am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbread 
Merge commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4'

* commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4':
  DO NOT MERGE
 2010-10-18 08:04:08 -07:00