Jamie Gennis
b312f1155c
am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
...
* commit '38041d6b3c3d838d99f70f9b1195d69487edf689':
Flag window animation transactions as animations.
2012-10-15 20:19:40 -07:00
Romain Guy
3e6c9ba677
am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
...
* commit 'cb09dba0b80ff51e0a481959c5f0056f7a292ea7':
Revert "Fix for bug 6050753."
2012-10-15 20:19:28 -07:00
Romain Guy
e9d0c9920b
am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
...
* commit '8ab33df56b1c22b7557f7dbe2d0b1f07d8ee1e47':
Ensure we always request conformant OpenGL ES 2.0 contexts
2012-10-15 20:19:24 -07:00
Raph Levien
244f5125ab
am b9e224cc: am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
...
* commit 'b9e224ccb5604032ee6a11789b4e03c747a15838':
Fix for bug 7344916 text view flickers when you hit enter
2012-10-15 20:18:59 -07:00
Jamie Gennis
38041d6b3c
am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
...
* commit '809bb404da66498f1723279542d2a7d1f4512052':
Flag window animation transactions as animations.
2012-10-15 19:54:18 -07:00
Jamie Gennis
809bb404da
Merge "Flag window animation transactions as animations." into jb-mr1-dev
2012-10-15 19:52:05 -07:00
Jamie Gennis
b6ce6e42cc
Flag window animation transactions as animations.
...
This change makes WindowManager use the new eAnimation flag when animating
windows. This prevents some of the window updates from being combined with
updates from prior animation frames.
Bug: 7353840
Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
2012-10-15 19:19:50 -07:00
Romain Guy
cb09dba0b8
am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
...
* commit '69fbc3c089e3399ebd94cc3a7ba846f426a7b32d':
Revert "Fix for bug 6050753."
2012-10-15 18:47:46 -07:00
Romain Guy
8ab33df56b
am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
...
* commit 'edefaa25db7c9cd4facab258a0fd5913c6493bd0':
Ensure we always request conformant OpenGL ES 2.0 contexts
2012-10-15 18:47:42 -07:00
Romain Guy
69fbc3c089
Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
2012-10-15 18:45:03 -07:00
Romain Guy
edefaa25db
Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
2012-10-15 18:43:59 -07:00
Raph Levien
b9e224ccb5
am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
...
* commit '6f8c1bad8a7891f50eda2d3d14f774e28b8f8107':
Fix for bug 7344916 text view flickers when you hit enter
2012-10-15 18:25:13 -07:00
Raph Levien
6f8c1bad8a
Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
2012-10-15 18:19:50 -07:00
Romain Guy
8efca54693
Ensure we always request conformant OpenGL ES 2.0 contexts
...
Change-Id: I6b9d6f2dace02ad28baef6811007302b8e552a54
2012-10-15 18:09:49 -07:00
Raph Levien
f5c1a8798f
Fix for bug 7344916 text view flickers when you hit enter
...
The flickering was caused by trying to scroll to the cursor position
while the view was in an inconsistent state (text updated to change the
number of lines, but layout not done yet). This patch defers the actual
setting of the cursor until layout is done, when layout is pending.
Change-Id: I8ed3a402beb8058ac7a7f3935afeb946a23308ab
2012-10-15 17:22:26 -07:00
Romain Guy
a97a9beff7
am 807e4375: am f2e28abb: Merge "Update javadoc" into jb-mr1-dev
...
* commit '807e4375e970741fdc9f8315e4a7ba29b4d7549b':
Update javadoc
2012-10-15 14:23:48 -07:00
Romain Guy
807e4375e9
am f2e28abb: Merge "Update javadoc" into jb-mr1-dev
...
* commit 'f2e28abb1375c5ca513eac9dcde5c349f771de0f':
Update javadoc
2012-10-15 14:22:20 -07:00
Romain Guy
f2e28abb13
Merge "Update javadoc" into jb-mr1-dev
2012-10-15 14:19:29 -07:00
Jeff Sharkey
288c32805b
am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev
...
* commit 'ec8d1280ac70245dcc533054b748f794f33f85bd':
Protect more service dump() methods.
2012-10-15 14:06:09 -07:00
Jeff Sharkey
ec8d1280ac
am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev
...
* commit '532c9c4543135463ee1f39b282d3156a3e226d50':
Protect more service dump() methods.
2012-10-15 14:03:53 -07:00
Romain Guy
8e63bcc63f
Revert "Fix for bug 6050753."
...
This reverts commit c29f031598 .
2012-10-15 13:24:58 -07:00
Romain Guy
edc9005289
Update javadoc
...
Some View.post*() methods can be invoked from arbitrary thread
independently of whether the View is attached to a window.
Change-Id: I587b5909ab8b06665978d001548d56c8c22043c1
2012-10-15 12:31:57 -07:00
Jeff Sharkey
52801aae89
Protect more service dump() methods.
...
Bug: 6406965
Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29
2012-10-15 10:59:51 -07:00
Chris Wren
33856c19df
am 5d0a560c: am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
...
* commit '5d0a560ca4e455bfe8f77c2872a479e210b38dcf':
delay onDreamingStarted() to work around asynchrony.
2012-10-15 09:10:21 -07:00
Chris Wren
5d0a560ca4
am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
...
* commit '4a01f2b5dcb5bcb72358905db402731013195cfd':
delay onDreamingStarted() to work around asynchrony.
2012-10-15 09:08:17 -07:00
Chris Wren
4a01f2b5dc
Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
2012-10-15 09:06:37 -07:00
Fabrice Di Meglio
df4bcd6a36
am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev
...
* commit 'b65b5133e7590e68053bbf4530b31b7206c7b984':
Fix bug #7334966 Padding is still broken in RTL languages
2012-10-12 18:29:59 -07:00
Fabrice Di Meglio
b65b5133e7
am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev
...
* commit 'f9307c5c00bd3e8338bd478fec67a0190d515558':
Fix bug #7334966 Padding is still broken in RTL languages
2012-10-12 18:28:33 -07:00
Fabrice Di Meglio
f9307c5c00
Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev
2012-10-12 18:25:55 -07:00
Guang Zhu
a16721402b
am d3036f7e: am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev
...
* commit 'd3036f7e89747d7347eb8b94c5517162cc71b5af':
use BufferedInputStream in readTextFile
2012-10-12 16:33:57 -07:00
Guang Zhu
d3036f7e89
am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev
...
* commit 'd4805af6163b6873abbf628f6672a2188e24ef3c':
use BufferedInputStream in readTextFile
2012-10-12 16:32:47 -07:00
Fabrice Di Meglio
84ebb35f39
Fix bug #7334966 Padding is still broken in RTL languages
...
- do correct resolution and reset propagation for all RTL properties (padding and drawables included)
- fix CheckedTextView padding too
Change-Id: Ie603683a2324b2a6ef2c03633d01d5726c883b90
2012-10-12 15:54:10 -07:00
Guang Zhu
90619816d9
use BufferedInputStream in readTextFile
...
With FileInputStream, using assumption of bytes read (as
returned by read function) not matching buffer size as EOF is
not correct, we hit this when reading from /proc in some cases.
BufferedInputStream's behavior matches that assumption due to
its implementation.
Bug: 7342759
Change-Id: Ibb06dbe1fbe33f6f880524f7555ff5542889ea50
2012-10-12 15:50:44 -07:00
Chris Wren
f434d23a16
delay onDreamingStarted() to work around asynchrony.
...
Bug: 7328682
Change-Id: I86144b0b34eade332543244bb3aff5f9695ff7f7
2012-10-12 18:37:02 -04:00
Charles Chen
935db6c561
am e228b5b9: am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev
...
* commit 'e228b5b920233a151964019fb6c52412cc36425a':
Don't alter accessibility JS APIs unless a page is about to load.
2012-10-12 13:52:46 -07:00
Charles Chen
e228b5b920
am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev
...
* commit '4c38e24afb0fe68d6e9f6e924e6426808be2611a':
Don't alter accessibility JS APIs unless a page is about to load.
2012-10-12 13:49:39 -07:00
Charles Chen
4c38e24afb
Merge "Don't alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev
2012-10-12 13:46:09 -07:00
Amith Yamasani
80ef0935cf
am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev
...
* commit 'bede7587df180cc0a7335bac03e789249601db9a':
Temporarily disable multiuser for specific builds
2012-10-12 13:17:43 -07:00
Amith Yamasani
bede7587df
am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev
...
* commit 'fe49af266ea09bb83438c7694051bc950c5c7437':
Temporarily disable multiuser for specific builds
2012-10-12 13:15:18 -07:00
Amith Yamasani
fe49af266e
Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev
2012-10-12 13:13:25 -07:00
Amith Yamasani
ff54920ed2
Temporarily disable multiuser for specific builds
...
Enable switching through power menu for other builds
Change-Id: I0bd8450583e078b0a83fb639337427ab84db5ab8
2012-10-12 12:44:49 -07:00
Fabrice Di Meglio
d828e328bc
am a1d72e15: am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev
...
* commit 'a1d72e15f6fd5e6e330a70d550327ab8c8fcdbcf':
Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
2012-10-12 11:43:43 -07:00
alanv
03e636f33d
Don't alter accessibility JS APIs unless a page is about to load.
...
Previously we were adding and removing the APIs on window attach and
detach, but a page's life cycle is not related to attach/detach. This
patch also ensures that ChromeVox is not null before calling. Includes
formatting fixes and extra comments in the waitForResultTimedLocked
method to improve readability. Fixes parsing of integer resultId, which
was being parsed using Long.
Bug: 7328348
Change-Id: I6b81a8e4d8209f8e99419da9b8250abe57e25048
2012-10-12 11:42:37 -07:00
Fabrice Di Meglio
a1d72e15f6
am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev
...
* commit '6ffbe600696396a0444f20f61223923146e9520b':
Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
2012-10-12 11:42:17 -07:00
Fabrice Di Meglio
6ffbe60069
Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev
2012-10-12 11:39:23 -07:00
John Reck
e45ecba93b
am be0786ae: am b746febc: Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev
...
* commit 'be0786ae0bcd8a9d7bbcc8b81afa8e07767cd3dc':
Center text selection point to avoid rounding glitches
2012-10-12 11:03:29 -07:00
Fabrice Di Meglio
3cc10f420f
Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
...
- add horizontal gravity support
- use gravity for doing layout depending on layout direction
Change-Id: I562e824d15da9b00e1392f125b293aee21f8ee16
2012-10-11 19:17:39 -07:00
John Reck
be0786ae0b
am b746febc: Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev
...
* commit 'b746febca2e3f21704556647cd987fdf902fb779':
Center text selection point to avoid rounding glitches
2012-10-11 18:27:56 -07:00
John Reck
b746febca2
Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev
2012-10-11 18:25:55 -07:00
John Reck
9fcef3d023
Center text selection point to avoid rounding glitches
...
Bug: 7313424
Change-Id: I5356bec61e3d1244b506486300f059aa0bba6d9e
2012-10-11 18:08:03 -07:00