summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove renderer abstract class"Chris Craik2015-02-265-273/+112
|\
| * Remove renderer abstract classChris Craik2015-02-255-273/+112
| | | | | | | | | | | | | | No longer needed, allowing vast majority of methods on OpenGLRenderer to be non-virtual. Change-Id: I8a6ee042b95050dc666887579ef4e1c7a8f9b33b
* | Merge "Glop support for custom textured UVs, simplify drawBitmap(src,dst)"Chris Craik2015-02-267-68/+100
|\ \ | |/
| * Glop support for custom textured UVs, simplify drawBitmap(src,dst)Chris Craik2015-02-257-68/+100
| | | | | | | | | | | | Front load the scaling-to-support-shaders to record time. Change-Id: I861c82d9d16d3c5e063cf87230127eed0b3f9b54
* | Merge "Add null egl/gles stub support"John Reck2015-02-269-25/+448
|\ \
| * | Add null egl/gles stub supportJohn Reck2015-02-259-25/+448
| | | | | | | | | | | | Change-Id: I41372585202f69ef31a4ef95efc75fb7a1ff7289
* | | am 747e4da6: am fa514d69: am 5b3b1a17: am bd409177: am 1836eea0: am ↵Rich Slogar2015-02-261-12/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs * commit '747e4da61850fc5f6fe66e6cc7c3438636d27fe8': docs: remove exploring sdk link
| * \ \ am fa514d69: am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am ↵Rich Slogar2015-02-251-12/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs * commit 'fa514d6907db6c96ac662b6e06897bcc020c6a43': docs: remove exploring sdk link
| | * \ \ am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge ↵Rich Slogar2015-02-251-12/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: remove exploring sdk link" into lmp-docs * commit '5b3b1a17da0f59ee7a0b4c4defb1993b9de85b3f': docs: remove exploring sdk link
| | | * \ \ am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove ↵Rich Slogar2015-02-251-12/+13
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exploring sdk link" into lmp-docs * commit 'bd409177ec6b422e18d9e0c94ffab86dfd368976': docs: remove exploring sdk link
| | | | * \ \ am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk ↵Rich Slogar2015-02-251-12/+13
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link" into lmp-docs * commit '1836eea08229dda72ff89d24f75f9f4948be957e': docs: remove exploring sdk link
| | | | | * \ \ am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docsRich Slogar2015-02-251-12/+13
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '411046324743055e9eef3b04109c998b5354b496': docs: remove exploring sdk link
| | | | | | * \ \ am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docsRich Slogar2015-02-251-12/+13
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0': docs: remove exploring sdk link
| | | | | | | * \ \ Merge "docs: remove exploring sdk link" into lmp-docsRich Slogar2015-02-251-12/+13
| | | | | | | |\ \ \
| | | | | | | | * | | docs: remove exploring sdk linkRich Slogar2015-02-231-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android 153523 Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
* | | | | | | | | | | am fdbda56a: am 1e72a9b2: am 2ed2c141: am 81049aff: am f8a95b0b: am ↵Rich Slogar2015-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs * commit 'fdbda56a2d3394c2ff28075162b683e05bf8fb1c': docs: note to install linux packages v2 update
| * | | | | | | | | | am 1e72a9b2: am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am ↵Rich Slogar2015-02-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs * commit '1e72a9b2477bb350cb7922ad4f166eba62b0bbdd': docs: note to install linux packages v2 update
| | * | | | | | | | | am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge ↵Rich Slogar2015-02-251-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: note to install linux packages v2 update" into lmp-docs * commit '2ed2c141f338bef0f11ae93167b7c810bbbd645d': docs: note to install linux packages v2 update
| | | * | | | | | | | am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to ↵Rich Slogar2015-02-251-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install linux packages v2 update" into lmp-docs * commit '81049aff4bad07427dc18543be1c759e16267a63': docs: note to install linux packages v2 update
| | | | * | | | | | | am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux ↵Rich Slogar2015-02-251-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packages v2 update" into lmp-docs * commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194': docs: note to install linux packages v2 update
| | | | | * | | | | | am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 ↵Rich Slogar2015-02-251-1/+1
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit '84994e876e728fa57f06d803f7c4abfbc9df40db': docs: note to install linux packages v2 update
| | | | | | * | | | | am db2ebca7: Merge "docs: note to install linux packages v2 update" into ↵Rich Slogar2015-02-251-1/+1
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91': docs: note to install linux packages v2 update
| | | | | | | * | | | Merge "docs: note to install linux packages v2 update" into lmp-docsRich Slogar2015-02-251-1/+1
| | | | | | | |\ \ \ \
| | | | | | | | * | | | docs: note to install linux packages v2 updateRich Slogar2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android 155803 Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
* | | | | | | | | | | | Merge "Add missing headers."Jeff Brown2015-02-252-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing headers.Jeff Brown2015-02-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida86e14986e6391e6f65581ef0987ad8d16576f9
* | | | | | | | | | | | | Merge "Fix build."Jeff Brown2015-02-251-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix build.Filip Gruszczynski2015-02-251-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76c4a2755e2ae4bf9d59f854a2adb7fd4ef0ffab
* | | | | | | | | | | | | am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl ↵Dan Albert2015-02-253-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions." * commit '72e7217d0bd1035fc0c947da5d1e802624774a80': Update autogenerated gl functions.
| * | | | | | | | | | | am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."Dan Albert2015-02-253-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7121d703067b440281f27a40b8273b17bef1e62': Update autogenerated gl functions.
| | * \ \ \ \ \ \ \ \ \ \ am b78cce6f: Merge "Update autogenerated gl functions."Dan Albert2015-02-253-4/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe': Update autogenerated gl functions.
| | | * \ \ \ \ \ \ \ \ \ \ Merge "Update autogenerated gl functions."Dan Albert2015-02-253-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Update autogenerated gl functions.Dan Albert2015-02-233-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corresponding frameworks/native change: https://android-review.googlesource.com/#/c/134491/ Since this fixes the int-to-pointer cast issues, stop ignoring that warning. Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
* | | | | | | | | | | | | | | am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-devFilip Gruszczynski2015-02-258-1/+306
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fbcc7086fe742e641915ed5f097119d01613cb5': Burn in protection.
| * | | | | | | | | | | | | | am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-devFilip Gruszczynski2015-02-258-1/+306
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178': Burn in protection.
| | * | | | | | | | | | | | | Merge "Burn in protection." into lmp-mr1-modular-devFilip Gruszczynski2015-02-258-1/+306
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Burn in protection.Filip Gruszczynski2015-02-258-1/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19373758 Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
* | | | | | | | | | | | | | | | Merge "Document the limitations of Linkify addresses"Roozbeh Pournader2015-02-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Document the limitations of Linkify addressesRoozbeh Pournader2015-02-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that we are using WebView#findAddresses() which is limited to US addresses at the moment (at least according to its documentation), among various other limitations. Bug: 5847264 Change-Id: If86c6d7c11cc080f0fe3401ffb7bce8068c6016f
* | | | | | | | | | | | | | | | | Merge "Allow alternative policy description for secondary users"Fyodor Kupolov2015-02-253-22/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow alternative policy description for secondary usersFyodor Kupolov2015-02-243-22/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For policies like wipe-data, device admin policy description should be customizable for secondary users. Bug: 19194766 Change-Id: Idadbdf84d378cf4f1b42ac246a48edbfa97eaa9a
* | | | | | | | | | | | | | | | | | Merge "Relax Handler lint check slightly."Jeff Sharkey2015-02-251-27/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Relax Handler lint check slightly.Jeff Sharkey2015-02-251-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we avoid yelling at support library APIs. Change-Id: I20bab887fe8b1c7f4d197273ddedbcda48c5a429
* | | | | | | | | | | | | | | | | | | am 892609ad: am aeffc9ce: Merge "Always draw the circular emulator overlay ↵Griff Hazen2015-02-251-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with square dimensions" into lmp-mr1-modular-dev * commit '892609ad34145e6418e42c683428f1a880b4c874': Always draw the circular emulator overlay with square dimensions
| * | | | | | | | | | | | | | | | | | am aeffc9ce: Merge "Always draw the circular emulator overlay with square ↵Griff Hazen2015-02-251-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dimensions" into lmp-mr1-modular-dev * commit 'aeffc9cebd4e97889f5b2f61de38c60b83535ffa': Always draw the circular emulator overlay with square dimensions
| | * | | | | | | | | | | | | | | | | Merge "Always draw the circular emulator overlay with square dimensions" ↵Griff Hazen2015-02-251-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-modular-dev
| | | * | | | | | | | | | | | | | | | Always draw the circular emulator overlay with square dimensionsGriff Hazen2015-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17440607 Change-Id: I37bb99a0185c6269a3a541f0d810c11ff0acfb36
* | | | | | | | | | | | | | | | | | | am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* ↵Mark Salyzyn2015-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode flags" * commit 'f7b68049521b5f1c31894f5dad529f719098e987': jni: switch to ANDROID_LOG_* mode flags
| * | | | | | | | | | | | | | | | | | am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"Mark Salyzyn2015-02-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '533758c1fb2dcf5b50db46b60d26ecae72fc71ee': jni: switch to ANDROID_LOG_* mode flags
| | * | | | | | | | | | | | | | | | | am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"Mark Salyzyn2015-02-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f': jni: switch to ANDROID_LOG_* mode flags
generated by cgit v1.1 at 2025-02-15 16:43:41 +0000