summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Some cleanup"Alex Sakhartchouk2010-10-195-48/+6
|\
| * Some cleanupAlex Sakhartchouk2010-10-185-48/+6
| | | | | | | | Change-Id: Ie10746d2f77318d63101d919214e76f778159fa0
* | add api level 9 'since' flag to docsScott Main2010-10-191-0/+1
| | | | | | | | Change-Id: Idee873a20ae0f3f0a9705997c8b73ce7f181906f
* | Remove public resource padding.Dianne Hackborn2010-10-193-3365/+116
| | | | | | | | Change-Id: Id4f28ecfb7a87267c256571ed5f98652730b44fc
* | Merge "Add fast/js/regexp-overflow.html to DumpRenderTree skip list"Steve Block2010-10-191-10/+6
|\ \
| * | Add fast/js/regexp-overflow.html to DumpRenderTree skip listSteve Block2010-10-191-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fails beacsue the result of the test is so large that DRT suffers OOM when reading the result. This will be fixed when we switch to DRT2. Skipping for now to keep the crashes at zero. Also fixes bug numbers for other skipped tests Bug: 2697589 Change-Id: I897ff1f0a2941d305af5fb1c8de8f6690365fb9e
* | | Merge "Fix DumpRenderTree2 to correctly handle crashed tests"Steve Block2010-10-192-9/+17
|\ \ \
| * | | Fix DumpRenderTree2 to correctly handle crashed testsSteve Block2010-10-182-9/+17
| | | | | | | | | | | | | | | | Change-Id: I894987d5b8f24ea31893aefe3cb6450c2736aa90
* | | | Merge "New dialog assets. Cancelable AlertDialogs may now be canceled by ↵Adam Powell2010-10-1831-2/+21
|\ \ \ \ | | | | | | | | | | | | | | | tapping outside."
| * | | | New dialog assets. Cancelable AlertDialogs may now be canceled by tapping ↵Adam Powell2010-10-1831-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside. Change-Id: I061f09bd79a5f2b627fb0f01aba36f37449b849d
* | | | | Merge "Remove unneeded inclusion of rs_math.rsh."Shih-wei Liao2010-10-181-3/+0
|\ \ \ \ \
| * | | | | Remove unneeded inclusion of rs_math.rsh.Shih-wei Liao2010-10-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e9beb88c3b0fb88e30bdbabdde2a2529825dbef
* | | | | | Merge "Add support for calibrating touch position."Jeff Brown2010-10-182-5/+43
|\ \ \ \ \ \
| * | | | | | Add support for calibrating touch position.Jeff Brown2010-10-182-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for tweaking touch screen alignment without having to modify the kernel device driver x/y axis bounds. Change-Id: I6ca43d3c138548f9dfb76aa33150a0c853698fb6
* | | | | | | Merge "Cleaned up the way StackView draws outside of its bounds"Adam Cohen2010-10-181-38/+37
|\ \ \ \ \ \ \
| * | | | | | | Cleaned up the way StackView draws outside of its boundsAdam Cohen2010-10-181-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a0e8d970434fbaf13b2f82c5d3b3dcbdc2488b5
* | | | | | | | resolved conflicts for merge of 6775754a to masterGilles Debunne2010-10-181-4/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | Change-Id: Ib03417aa3f13839b7fdf24f7d66b2d449589d41e
| * | | | | | | am 3d01cb93: Merge "Removed "Select word" option on password fields." into ↵Gilles Debunne2010-10-181-4/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '3d01cb934ba2c5161689834d49f520313e554571' into gingerbread-plus-aosp * commit '3d01cb934ba2c5161689834d49f520313e554571': Removed "Select word" option on password fields.
| | * \ \ \ \ \ \ Merge "Removed "Select word" option on password fields." into gingerbreadGilles Debunne2010-10-181-4/+28
| | |\ \ \ \ \ \ \
| | | * | | | | | | Removed "Select word" option on password fields.Gilles Debunne2010-10-151-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would return an arbitrary selection around current position. Rely on select all instead. Bug: 3100750 Change-Id: I73d995e6481d7c230cc9f334c72fbfb7e9828007
* | | | | | | | | | am 06ff27f0: am 83366dfb: Merge "Add the HTML5Audio class, to support the ↵Ben Murdoch2010-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio tag." into gingerbread Merge commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83' * commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83': Add the HTML5Audio class, to support the audio tag.
| * | | | | | | | | am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." ↵Ben Murdoch2010-10-181-0/+224
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp * commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3': Add the HTML5Audio class, to support the audio tag.
| | * | | | | | | | Merge "Add the HTML5Audio class, to support the audio tag." into gingerbreadBen Murdoch2010-10-181-0/+224
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add the HTML5Audio class, to support the audio tag.Nicolas Roard2010-10-181-0/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE. Cherry pick to GingerBread. Bug: 3101402 Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b
* | | | | | | | | | | am 6b09a90a: am e47150e9: Fix up NFC permissions.Nick Pelly2010-10-186-66/+44
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e' * commit '6b09a90a818137de52a0c7325339849ccf584b9e': Fix up NFC permissions.
| * | | | | | | | | | am e47150e9: Fix up NFC permissions.Nick Pelly2010-10-186-66/+44
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp * commit 'e47150e933e6f610546f57183477f324566e521e': Fix up NFC permissions.
| | * | | | | | | | | Fix up NFC permissions.Nick Pelly2010-10-186-66/+44
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to ↵Nick Pelly2010-10-189-610/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f/b/c/j/com/android/internal/nfc. Merge commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65' * commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65': Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
| * | | | | | | | | am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to ↵Nick Pelly2010-10-179-610/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f/b/c/j/com/android/internal/nfc. Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp * commit 'd1f7f4a68375f879671d300510f23d3ee78a500e': Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
| | * | | | | | | | Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.Nick Pelly2010-10-179-610/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | | | | | am 73cd4fff: am a926540d: Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-185-22/+163
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b' * commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b': Implement methods introduced in draft #5 NFC API.
| * | | | | | | | am a926540d: Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-175-22/+163
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a926540d5455a973dd8ca19c00c108620d9c68c2' into gingerbread-plus-aosp * commit 'a926540d5455a973dd8ca19c00c108620d9c68c2': Implement methods introduced in draft #5 NFC API.
| | * | | | | | | Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-175-22/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is implemented but still do not support muli-protocol tags. Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | | | | Merge "Fix race condition between starting of service and getting the ↵Jaikumar Ganesh2010-10-183-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Profile Proxy."
| * | | | | | | | | Fix race condition between starting of service and getting the Profile Proxy.Jaikumar Ganesh2010-10-183-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incoming A2DP connections were not working. Change-Id: I5a3322ddb39b2512495b4cd2e35593da0f605087
* | | | | | | | | | Temporarily removed call to drawCircle in BulletSpan.Gilles Debunne2010-10-181-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced by a drawPath. drawCircle is not supported by openGL for now. Bug: 3101235 Change-Id: I0c050097e3cb87f9d4c703062d4250d08247c99e
* | | | | | | | | | Merge "Small cleanup."Romain Guy2010-10-184-17/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Small cleanup.Romain Guy2010-10-184-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e5b9154a2d93af793d62f462d68cb7c6c3f6d75
* | | | | | | | | | | Merge "Use VBOs to render most geometries."Romain Guy2010-10-1811-85/+172
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Use VBOs to render most geometries.Romain Guy2010-10-1811-85/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4360dc4fe5693ab425450c107282b2c22db4dca7
* | | | | | | | | | | Merge "Fix for text selection at end of line."Gilles Debunne2010-10-181-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix for text selection at end of line.Gilles Debunne2010-10-181-0/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3106935 Change-Id: Ieee7f50385baae359db45472ffc800a01956cb40
* | | | | | | | | | Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps ↵Brian Carlstrom2010-10-181-1/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | contents"
| * | | | | | | | | Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contentsBrian Carlstrom2010-10-171-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I86da98bc48111007d8226d8d0dbc7be470bde877
* | | | | | | | | | resolved conflicts for merge of 964eb438 to masterKenny Root2010-10-189-18/+325
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
| * | | | | | | | am 42499170: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-169-18/+325
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp * commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0': Implement issue #3094621 and #3094609 - wipe sd card
| | * | | | | | | Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-169-18/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3094621: add "wipe sd card" option to factory data reset 3094609: collapse unmount/format into one command Also since we have decided that it is important to consider the Crespo storage as internal storage, DevicePolicyManager gets a new API to be able to wipe it. (No big deal, since all of the work for this is now done in the implementation of the new UI.) Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
* | | | | | | | | Merge "Adding new unit test for rsDebug()."Stephen Hines2010-10-183-0/+99
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding new unit test for rsDebug().Stephen Hines2010-10-183-0/+99
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a354e40640b83aca3148aa0cf13d3335ff37dd4
* | | | | | | | | Merge changes I4a85ff69,Idba4acc2Steve Block2010-10-182-31/+42
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | * changes: Fix DumpRenderTree2 script to allow only one path to be specified Improve error handling in DumpRenderTree2 scripts
generated by cgit v1.1 at 2025-11-26 20:43:25 +0000