summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Add support for the new native Builder class on StaticLayout.Diego Perez2015-03-101-2/+36
| | | | | | | This patch updates StaticLayout_Delegate to support the new Builder class introduced in ag/646289. Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
* am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to ↵Dan Albert2015-03-053-26/+19
|\ | | | | | | | | | | | | stage-aosp-master * commit '7a79c4cac3b0c722832e868346db2375b6d6c379': Stop using namespace std.
| * am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\ | | | | | | | | | | | | * commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7': Stop using namespace std.
| | * resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| | |\ | | | | | | | | | | | | Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
| | | * Stop using namespace std.Dan Albert2015-03-043-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern of #include and using namespace std here fails to build with GCC. At first glance it's a GCC bug rather than libc++ doing something wrong. Regardless, it can be worked around by just specifying std:: where appropriate. Bug: 19606303 Change-Id: I5652682eae7ca7559cf2a9307909859013440781
* | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | | | Merge "Added function to render a drawable in all available states"Andrew Shulaev2015-03-054-20/+68
|\ \ \ \
| * | | | Added function to render a drawable in all available statesAndrew Shulaev2015-03-054-20/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730. Change-Id: I596855047d78c3c718744ad61432fc45e1239634
* | | | | Merge "Fix crash when shadowSize is 0"Diego Perez2015-03-051-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix crash when shadowSize is 0Diego Perez2015-03-041-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
* | | | | Revert "Added function to render a drawable in all available states"Andrew Shulaev2015-03-044-68/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 63483e17de4d2441acaabcee4185b0bb25e1d94c. Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18
* | | | | Added function to render a drawable in all available statesAndrew Shulaev2015-03-044-20/+68
| | | | | | | | | | | | | | | | | | | | Change-Id: I230cc5775a09120efe9c82a4017b001aa510ddff
* | | | | am 70775bed: am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am ↵Deepanshu Gupta2015-03-022-517/+37
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev * commit '70775beddd3773a942084f5ef939da0a70065475': Correct PorterDuff filters.
| * | | | am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge ↵Deepanshu Gupta2015-03-022-517/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Correct PorterDuff filters." into lmp-dev * commit 'fb96187bb6004e5d0b22e4d942aa236a08d8913b': Correct PorterDuff filters.
| | * \ \ \ am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct ↵Deepanshu Gupta2015-03-022-517/+37
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PorterDuff filters." into lmp-dev * commit '32dc37b72e787ca9323c01aa86e65694b6ff0cf7': Correct PorterDuff filters.
| | | * \ \ \ am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863': Correct PorterDuff filters.
| | | | * \ \ \ am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71': Correct PorterDuff filters.
| | | | | * \ \ \ Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | | | |\ \ \ \
| | | | | | * | | | Correct PorterDuff filters.Deepanshu Gupta2015-02-262-517/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove unused modes - makes the class more manageable, and missing modes can always be readded from the git history. 2. Reuse the existing BlendComposite instances where possible. 3. Fix incorrect alpha computation for multiply mode. 4. Change the alpha computation for all blend modes to compenstate for the fact that the color filter image that we create extends beyond the image it is inteded to be applied to. Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
* | | | | | | | | | am 6e64fabe: am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am ↵Deepanshu Gupta2015-03-021-1/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev * commit '6e64fabecafcc4c367dc04cd071ff8ddc8bb3d85': Fix codestyle for switch statements.
| * | | | | | | | | am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix ↵Deepanshu Gupta2015-03-021-1/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codestyle for switch statements." into lmp-dev * commit '7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07': Fix codestyle for switch statements.
| | * | | | | | | | am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for ↵Deepanshu Gupta2015-03-021-1/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch statements." into lmp-dev * commit '4e87709b8b41a12d6caf2bd1110beed20e5b88e5': Fix codestyle for switch statements.
| | | * | | | | | | am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into ↵Deepanshu Gupta2015-03-021-1/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5': Fix codestyle for switch statements.
| | | | * | | | | | am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84': Fix codestyle for switch statements.
| | | | | * | | | | Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Fix codestyle for switch statements.Deepanshu Gupta2015-02-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix intellij's codestyle settings for indenting switch/case statement. Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
* | | | | | | | | | am 1fe1022d: am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am ↵Deepanshu Gupta2015-03-021-3/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev * commit '1fe1022dbd7642373e0e2d465d29ad3e1226a8b2': Better error msg for StateList/Hexadecimal Color.
| * | | | | | | | | am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge ↵Deepanshu Gupta2015-03-021-3/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Better error msg for StateList/Hexadecimal Color." into lmp-dev * commit '4a194d3b7f3ea4aebc5a1a8f95ccaac248c1b89d': Better error msg for StateList/Hexadecimal Color.
| | * | | | | | | | am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg ↵Deepanshu Gupta2015-03-021-3/+13
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for StateList/Hexadecimal Color." into lmp-dev * commit '6250030736e3ea25bacc92eba4c269dc6a6ee3db': Better error msg for StateList/Hexadecimal Color.
| | | * | | | | | | am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal ↵Deepanshu Gupta2015-03-021-3/+13
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Color." into lmp-dev * commit '81449b2c4a63392bff22d77f331f4db52011884b': Better error msg for StateList/Hexadecimal Color.
| | | | * | | | | | am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into ↵Deepanshu Gupta2015-03-021-3/+13
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '10d620ff2c4770e926b693e833105e8dbbd5fa86': Better error msg for StateList/Hexadecimal Color.
| | | | | * | | | | Merge "Better error msg for StateList/Hexadecimal Color." into lmp-devDeepanshu Gupta2015-03-021-3/+13
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Better error msg for StateList/Hexadecimal Color.Deepanshu Gupta2015-02-231-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throw a better error message when resolving a hexadecimal color value but the user gave a Color State List. The two are easy to confuse since the only way to distinguish between the two is to look at the definition. Bug: http://b.android.com/70110 Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
* | | | | | | | | | am c74295db: am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar ↵Deepanshu Gupta2015-03-021-2/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | time for 5.1" into lmp-mr1-dev * commit 'c74295db3048d964679913f146511ce3ad838089': Add status bar time for 5.1
| * | | | | | | | am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" ↵Deepanshu Gupta2015-03-021-2/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'bf815f495270b466e53bec20772b41ff4397ac83': Add status bar time for 5.1
| | * | | | | | | am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-devDeepanshu Gupta2015-03-021-2/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b4caab1a87b659498d30af194ae511526c503ba': Add status bar time for 5.1
| | | * | | | | | Add status bar time for 5.1Deepanshu Gupta2015-02-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f
* | | | | | | | | Add Context.getSystemService(Class<?>).Jeff Brown2015-02-251-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an overload of getSystemService() that takes a class instead of a service name to eliminate the extra cast and provide more type safety. Cleaned up docs. Removed the default constructor of BatteryManager which should not have existed. Change-Id: I9da46b20641fc83ecd3342560e5b94cb721f289c
* | | | | | | | | 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
* | | | | | | | | | resolved conflicts for merge of 57bb5f5c to masterChad Jones2015-02-231-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
| * | | | | | | | | am c0c39516: Merge "Hold a wake lock while dozing when display updates are ↵Joe LaPenna2015-02-241-0/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending." into lmp-mr1-modular-dev * commit 'c0c395162ff14b83694158663470ad60e065d9a9': Hold a wake lock while dozing when display updates are pending.
| | * | | | | | | | Merge "Hold a wake lock while dozing when display updates are pending." into ↵Joe LaPenna2015-02-241-0/+5
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | lmp-mr1-modular-dev
| | | * | | | | | | Hold a wake lock while dozing when display updates are pending.Jeff Brown2015-02-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the display state is DOZE or DOZE_SUSPEND, assume this means that the AP may go to sleep at any time so hold a wake lock for a little while starting when traversals are scheduled to ensure that the AP remains awake long enough to draw and post the frame to the display hardware. This patch is somewhat approximate but should be good enough for most devices today. Note that the implementation uses the window manager to ensure that the window which wants to draw is actually visible before acquiring the wake lock. There is a cost to this test (a round-trip) which should not be significant today since we do not expect apps to draw more than one frame or two while dozing. However, if we wanted to support animations in general, we might want to optimize it or eliminate the check altogether (since we can already account for the app's use of the wake lock). Another way to implement this functionality might be for the view hierarchy to listen for the power manager to report that it has entered a non-interactive power state before deciding to poke draw locks. This would be somewhat more accurate than watching the display state. Also, the draw lock timeout logic could be implemented more directly instead of using an ordinary timed wake lock. Bug: 18284212 Change-Id: I84b341c678303e8b7481bd1620e634fe82cc4350
* | | | | | | | | | am 01d5286f: am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am ↵Deepanshu Gupta2015-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev * commit '01d5286f388303551a2eb8f57e210f6d7a690cb5': Set forceFramework correctly for included layouts.
| * | | | | | | | | am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set ↵Deepanshu Gupta2015-02-231-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forceFramework correctly for included layouts." into lmp-dev * commit '8f022fd323063f9cebb481be650db40cf5e486f3': Set forceFramework correctly for included layouts.
| | * | | | | | | | am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included ↵Deepanshu Gupta2015-02-231-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | / / / / / | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | layouts." into lmp-dev * commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b': Set forceFramework correctly for included layouts.
| | | * | | | | | am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into ↵Deepanshu Gupta2015-02-231-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78': Set forceFramework correctly for included layouts.
| | | | * | | | | Set forceFramework correctly for included layouts.Deepanshu Gupta2015-02-231-1/+1
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/151326 Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
* | | | | | | | Avoid caching mImage on the main render loop and use clipping.Diego Perez2015-02-233-5/+33
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added a session flag that avoids caching mImage. This is useful when mImage is just a Graphics2D wrapper that might change at any time. + Make GcSnapshot aware of the clipping so it doesn't need to render the whole area if not needed. Change-Id: Ie0134c2bc2741b5fa6648313864c851bbac066cf
generated by cgit v1.1 at 2025-01-07 05:47:58 +0000