Satoshi Kataoka
993ed86b99
am ea5fdf61: am 0d727c71: Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev
...
* commit 'ea5fdf6171abfcad59c4d2d00dbb0783fcb94251':
Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed
2012-09-04 20:34:15 -07:00
Mathias Agopian
54afe6abf9
am f87633f3: Merge "update to new SurfaceComposerClient API" into jb-mr1-dev
...
* commit 'f87633f38c399edf5b2c358992ecbbbbbad5a648':
update to new SurfaceComposerClient API
2012-09-04 20:31:30 -07:00
Satoshi Kataoka
ea5fdf6171
am 0d727c71: Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev
...
* commit '0d727c714b75b9d9c927eca83aacba8938b08537':
Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed
2012-09-04 20:31:27 -07:00
Mathias Agopian
f87633f38c
Merge "update to new SurfaceComposerClient API" into jb-mr1-dev
2012-09-04 20:30:02 -07:00
Satoshi Kataoka
0d727c714b
Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev
2012-09-04 20:27:50 -07:00
Mathias Agopian
63f1c43fbe
update to new SurfaceComposerClient API
...
Change-Id: I8f2c96df56fe3a851b8ec03bb8734db0b6bea3d5
2012-09-04 20:23:23 -07:00
Jason Sams
5729fcdf95
Add ColorMatrix Intrinsic.
...
Add better intrinsic testing.
Include reference .rs for each intrinsic.
Change-Id: I327649f16ac8f641c2bd96f7b16f51874a3e820e
2012-09-04 19:57:40 -07:00
Adam Powell
13bee3ce42
am db5fa69e: (-s ours) am b326fa04: am 4289b49d: (-s ours) am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
...
* commit 'db5fa69e0c311a55fd4f894044231bee9d7a880a':
DO NOT MERGE - Make WebView track focal points more accurately
2012-09-04 19:56:15 -07:00
Adam Powell
f5806eae43
am c2c9c374: (-s ours) am 730b5b69: am 52da9fa7: (-s ours) am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
* commit 'c2c9c374bf3be2e558bff97a7127e470f8a3bbdd':
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-04 19:56:11 -07:00
Adam Powell
db5fa69e0c
am b326fa04: am 4289b49d: (-s ours) am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
...
* commit 'b326fa046b64b05b9969e0a6e89cf48577bfdae1':
DO NOT MERGE - Make WebView track focal points more accurately
2012-09-04 19:54:06 -07:00
Adam Powell
c2c9c374bf
am 730b5b69: am 52da9fa7: (-s ours) am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
* commit '730b5b69146dfb81c283f4a27906514b97811e96':
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-04 19:54:03 -07:00
Adam Powell
b326fa046b
am 4289b49d: (-s ours) am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
...
* commit '4289b49dd580bd51b97b8e571b23aa00dbaec310':
DO NOT MERGE - Make WebView track focal points more accurately
2012-09-04 19:51:45 -07:00
Adam Powell
730b5b6914
am 52da9fa7: (-s ours) am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
* commit '52da9fa7b53690c073b15d849d0d9befe47314f7':
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-04 19:51:42 -07:00
Adam Powell
4289b49dd5
am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
...
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
DO NOT MERGE - Make WebView track focal points more accurately
2012-09-04 19:49:13 -07:00
Adam Powell
52da9fa7b5
am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
* commit 'c4ce0da255df07e3d8a799aa4e9af2f1949ef4f4':
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-04 19:49:07 -07:00
Romain Guy
521dc51fd4
Don't invalidate all the glyphs when flushing large textures
...
FontRenderer::flushLargeCaches identifies the large textures used to
cache glyphs and visits all the known fonts to mark their glyphs
invalid if they belong to one of these large textures.
Unfortunately, Font::invalidateTextureCache had a logic error
which would make it mark *all glyphs* as invalid, not matter
what texture they belong to. This means that any large cache
flush would cause all glyphs to be invalidate, thus forcing
the rendering system to recreate them on the next draw.
Font::invalidateTextureCache is supposed to behave this way:
- If the specified cacheTexture is NULL (default value), mark
all glyphs as invalid (see FontRenderer::flushAllAndInvalidate())
- If cacheTexture is *not* NULL, invalidate only the glyphs for
which glyph.cacheTexture == cacheTexture.
The previous condition read:
if (cacheTexture || glyph.cacheTexture == cacheTexture)
This test *always* passes.
Change-Id: I418886cb594c81c6178d0f9e9953d975e991cf22
2012-09-04 19:20:06 -07:00
Fabrice Di Meglio
fa1babd221
Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
...
- cache the text aligment as we cannot resolve the text alignment during reset of the text direction
Change-Id: I79de625e517bf8bad6313fd5e349f1181b1eaa30
2012-09-04 19:11:25 -07:00
Romain Guy
e9ea4dce96
am dc79c554: am 6c8c6d9d: Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev
...
* commit 'dc79c5542afe4de84e155087a26dcb736554ec2a':
Correctly check the height of a glyph prior to caching it
2012-09-04 19:06:03 -07:00
Romain Guy
dc79c5542a
am 6c8c6d9d: Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev
...
* commit '6c8c6d9d44f97ebfba9c6d997665ad58ac39273a':
Correctly check the height of a glyph prior to caching it
2012-09-04 19:03:46 -07:00
Romain Guy
6c8c6d9d44
Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev
2012-09-04 19:01:48 -07:00
Romain Guy
e43f785b7f
Correctly check the height of a glyph prior to caching it
...
Change-Id: Iaf3977afc20fcde65bfda7b9e092b3e723241684
2012-09-04 18:58:46 -07:00
Dianne Hackborn
63ccd7c71c
am 623cc6b7: am bac6c129: Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
...
* commit '623cc6b79d4b4dbfea686529e4d6c2e10fe131eb':
Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
2012-09-04 18:54:50 -07:00
Dianne Hackborn
623cc6b79d
am bac6c129: Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
...
* commit 'bac6c12974c278a8045ed8deefb08d0348aa8496':
Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
2012-09-04 18:52:32 -07:00
Dianne Hackborn
bac6c12974
Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
2012-09-04 18:50:30 -07:00
Dianne Hackborn
fd8bf5c790
Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
...
broadcast asks to run as user -1 but is calling from user 0; this requires
Dupped bug of a different problem.
Change-Id: I15f4ab08b81f5f5746ba1cd183dee4f0b1281df5
2012-09-04 18:48:37 -07:00
Brian Muramatsu
153ec426a2
am 79b25e51: am 68093520: Merge "Fix GPS settings change listener in LocManager" into jb-mr1-dev
...
* commit '79b25e51c284b63d86d12f1a0e13d32e4109389e':
Fix GPS settings change listener in LocManager
2012-09-04 18:41:50 -07:00
Brian Muramatsu
79b25e51c2
am 68093520: Merge "Fix GPS settings change listener in LocManager" into jb-mr1-dev
...
* commit '68093520872476fc19b50c096a9536a826c084e5':
Fix GPS settings change listener in LocManager
2012-09-04 18:39:31 -07:00
Brian Muramatsu
6809352087
Merge "Fix GPS settings change listener in LocManager" into jb-mr1-dev
2012-09-04 18:36:35 -07:00
Adam Powell
9f3b0bfd0b
DO NOT MERGE - Make WebView track focal points more accurately
...
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
2012-09-04 18:33:56 -07:00
Adam Powell
c4ce0da255
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
2012-09-04 18:33:42 -07:00
Adam Powell
1cab7d049f
am e8f8fae5: am deeade34: Merge "Make WebView track focal points more accurately" into jb-mr1-dev
...
* commit 'e8f8fae548d67f658d5627081e6a0167f68544ae':
Make WebView track focal points more accurately
2012-09-04 18:24:38 -07:00
Adam Powell
e8f8fae548
am deeade34: Merge "Make WebView track focal points more accurately" into jb-mr1-dev
...
* commit 'deeade34cbcc354c97a10f2ecedb552eb495651a':
Make WebView track focal points more accurately
2012-09-04 18:22:23 -07:00
Adam Powell
fd679e4b39
am 40ae1bda: am adb93889: Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev
...
* commit '40ae1bda1e1c346ece55727fdae76f9c0b8a86a7':
Delay starting scale gesture events until a touch slop threshold
2012-09-04 18:21:54 -07:00
Adam Powell
40ae1bda1e
am adb93889: Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev
...
* commit 'adb93889ae013cee70c8c50622aa17e2e44c2ba8':
Delay starting scale gesture events until a touch slop threshold
2012-09-04 18:19:42 -07:00
Adam Powell
deeade34cb
Merge "Make WebView track focal points more accurately" into jb-mr1-dev
2012-09-04 18:19:30 -07:00
Adam Powell
adb93889ae
Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev
2012-09-04 18:17:10 -07:00
Brian Muramatsu
bb95cb9f99
Fix GPS settings change listener in LocManager
...
Bug 7051185
- Register a ContentObserver to track settings changes rather than
opening up a Cursor with a ContentQueryMap.
- Move updateProvidersLocked into init to assure that the
ContentObserver does not miss any changes.
- Move blacklist and fudger creation before loadProvidersLocked to
improve code readability.
Change-Id: I4d3e19fa33401c384bc2b00658d4336ea119e0e5
2012-09-04 18:16:24 -07:00
Jason Sams
388ba4a5d1
am 9145f0f0: am f1ffb4f7: Merge "update image processing to fix ScriptGroup names." into jb-mr1-dev
...
* commit '9145f0f0b204ef2821309c66acb6b423496f0ef9':
update image processing to fix ScriptGroup names.
2012-09-04 17:05:34 -07:00
Jason Sams
9145f0f0b2
am f1ffb4f7: Merge "update image processing to fix ScriptGroup names." into jb-mr1-dev
...
* commit 'f1ffb4f7fe2a8e9fd5df947a8071eccdeabaefd4':
update image processing to fix ScriptGroup names.
2012-09-04 17:01:49 -07:00
Chris Craik
8138fa82bf
am 4c0fe8a2: am d84aaa23: Merge "Fix line drawing path to use proportional distance from center" into jb-mr1-dev
...
* commit '4c0fe8a273a1ba0abebf667beeb95f49555a5552':
Fix line drawing path to use proportional distance from center
2012-09-04 17:01:03 -07:00
Jason Sams
f1ffb4f7fe
Merge "update image processing to fix ScriptGroup names." into jb-mr1-dev
2012-09-04 16:59:07 -07:00
Chris Craik
4c0fe8a273
am d84aaa23: Merge "Fix line drawing path to use proportional distance from center" into jb-mr1-dev
...
* commit 'd84aaa23a53b57834b0722ad36c460833dc4823c':
Fix line drawing path to use proportional distance from center
2012-09-04 16:58:46 -07:00
Chris Craik
d84aaa23a5
Merge "Fix line drawing path to use proportional distance from center" into jb-mr1-dev
2012-09-04 16:56:16 -07:00
Romain Guy
4dd30b41c4
am 07fc0afd: am c83f9828: Merge "Code cleanup in FontRenderer" into jb-mr1-dev
...
* commit '07fc0afd5eea403d6b0b7cabe5cd9fc740cca821':
Code cleanup in FontRenderer
2012-09-04 16:50:29 -07:00
Romain Guy
07fc0afd5e
am c83f9828: Merge "Code cleanup in FontRenderer" into jb-mr1-dev
...
* commit 'c83f982804e39b957fbef5bc3ecab163e03b216e':
Code cleanup in FontRenderer
2012-09-04 16:47:48 -07:00
Romain Guy
c83f982804
Merge "Code cleanup in FontRenderer" into jb-mr1-dev
2012-09-04 16:46:20 -07:00
Romain Guy
8087246d99
Code cleanup in FontRenderer
...
Change-Id: Ic788721c224a77f0a76f4cd6d9817b62e390a5a7
2012-09-04 16:44:17 -07:00
Craig Mautner
fc25e1ebf4
am bd696c05: am 7950d081: Merge "Make mLayoutNeeded per-Display." into jb-mr1-dev
...
* commit 'bd696c0573025fd5d424ef726b188a183895b609':
Make mLayoutNeeded per-Display.
2012-09-04 16:39:46 -07:00
Craig Mautner
bd696c0573
am 7950d081: Merge "Make mLayoutNeeded per-Display." into jb-mr1-dev
...
* commit '7950d081ac945d97427264f2a0531607097c2c71':
Make mLayoutNeeded per-Display.
2012-09-04 16:37:55 -07:00
Craig Mautner
7950d081ac
Merge "Make mLayoutNeeded per-Display." into jb-mr1-dev
2012-09-04 16:35:46 -07:00