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
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
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
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
Jim Miller
1deaf3c710
am 87d57952: Minor layout tweaks and bug fix in keyguard
...
* commit '87d57952af662a94637c1519b2189e22456af2db':
Minor layout tweaks and bug fix in keyguard
2012-10-15 02:31:04 -07:00
Jim Miller
87d57952af
Minor layout tweaks and bug fix in keyguard
...
- fix wrong string in SIM PUK unlock
- use buttonBar style for "emergency" and "forgot pattern" buttons
Bug 7341237
Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
2012-10-15 02:10:57 -07:00
Jim Miller
63b977de7e
am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev
...
* commit '14bb25a3864d38da8f2b73180db649039558a37b':
Fixing issues with pattern recovery / account view (issue 7341237):
2012-10-15 00:59:54 -07:00
Adam Cohen
6f131416ba
Fixing issues with pattern recovery / account view (issue 7341237):
...
-> Recovery button should only appear if account present
-> Recovery button should appear at bottom
-> Account view should have emergency call button
-> Account view should not show the clock / status area
Change-Id: Id12e8219f3fc6ecb14e82c5ec6ea4b3e28ed772d
2012-10-14 21:25:08 -07:00
Adam Powell
13b82d668d
am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
...
* commit '85341a76677abcccee757f7982b48b3bec2dcf63':
Fix keyguard dimensions; IME state for password view; layouts
2012-10-13 01:46:14 -07:00
Adam Powell
70bc9f24ce
Fix keyguard dimensions; IME state for password view; layouts
...
Fix a bug where ordering during inflation caused us not to set a
keyguard callback early enough to properly modify window flags. Add a
gross hack to work around this for now.
Fix status layouts to scale a bit more gracefully in the presence of
an IME.
Fix password layouts to scale more gracefully in the presence of an
IME
Bug 7343312
Bug 7341795
Bug 7342963
Bug 7343089
Change-Id: Ifb2c06defef11e8f7f9d0e09855632ed491bb31c
2012-10-13 01:25:51 -07:00
Adam Powell
eda02c7e32
am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
...
* commit '308b1a66b2d109feb509998bd50557ac7e6c90f4':
Fix offsets for glowpad on keyguard
2012-10-12 19:59:28 -07:00
Adam Powell
308b1a66b2
Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
2012-10-12 19:57:15 -07:00
Adam Powell
f8b93b5503
Fix offsets for glowpad on keyguard
...
Bug 7342491
Change-Id: Id9733070c28a85c47ac8b982768e47a4254bd825
2012-10-12 19:33:49 -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
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
Adam Powell
a1a51272ed
am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev
...
* commit '8dd3aaddba551eab19cf7ced07ab066575377c5e':
Align carrier info for glowpad keyguard screen
2012-10-12 15:14:29 -07:00
Adam Powell
8dd3aaddba
Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev
2012-10-12 15:11:51 -07:00
Jeff Sharkey
92eed99c09
am 95cccb9d: Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev
...
* commit '95cccb9d6175cb80d9312fadbe40cf7c4ec9f949':
Make all lockscreen widgets follow haptic flag.
2012-10-12 15:02:17 -07:00
Jeff Sharkey
95cccb9d61
Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev
2012-10-12 14:59:30 -07:00
Adam Powell
ba48a39e17
Align carrier info for glowpad keyguard screen
...
Bug 7317728
Change-Id: I0788c6555e2443026d0533e14b544a5daf810937
2012-10-12 14:41:04 -07:00
Jeff Sharkey
723a725e79
Make all lockscreen widgets follow haptic flag.
...
Bug: 7337006
Change-Id: I782e498b7528e612c4b06a75b77f5521c951cbd6
2012-10-12 14:26:31 -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
Keun young Park
27665148cb
am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
...
* commit 'c378656d5e0e686d806661bc271de3c7b1726430':
fix wrong read size in ToColor_S4444_Opaque
2012-10-12 13:44:08 -07:00
Keun young Park
c378656d5e
Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
2012-10-12 13:41:19 -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
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
Keun young Park
038953da05
fix wrong read size in ToColor_S4444_Opaque
...
- S4444 takes 16bits, not 32bits
- This caused sporadic failure in CTS BitmapFactoryTest#testDecodeStream4
Bug: 7179389
Change-Id: Ib36a3a569b3149d74f36ae67a069a7b65a72e895
2012-10-12 11:36:13 -07:00
Mike Cleron
f46071724b
am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev
...
* commit '732d88e14e4418feba1b80cf1d6010cddb1d5de5':
Change keyguard to use single-stage unlock.
2012-10-12 11:10:29 -07:00
Mike Cleron
732d88e14e
Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev
2012-10-12 11:07:52 -07:00
Baligh Uddin
5650d86aa3
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-12 09:29:55 -07:00
Baligh Uddin
18ab87f820
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-12 09:26:41 -07:00
Jim Miller
0ff7f010f8
Change keyguard to use single-stage unlock.
...
Change-Id: Ica175a90ef4400941c7c4f05a494003b85d5e88c
2012-10-12 03:53:57 -07:00
Christopher Tate
d6790721a9
am a3f33309: Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev
...
* commit 'a3f33309d7464a7ccca76b0475e2dfd009956e49':
DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
2012-10-11 19:26:09 -07:00
Christopher Tate
a3f33309d7
Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev
2012-10-11 19:23:07 -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
Baligh Uddin
40ad86e026
Import translations. DO NOT MERGE
...
Change-Id: I4ef6935d25a8428069225adb3648701e93fd9c17
Auto-generated-cl: translation import
2012-10-11 18:30:04 -07:00
Baligh Uddin
c60b9f66fa
Import translations. DO NOT MERGE
...
Change-Id: Ie30e500b62e03b710b99ec0eb1a8f98d9ad46106
Auto-generated-cl: translation import
2012-10-11 18:28:27 -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