Romain Guy
5dc228d234
am a97a9bef: am 807e4375: am f2e28abb: Merge "Update javadoc" into jb-mr1-dev
...
* commit 'a97a9beff7e3c66ca41a6e2029433bc9f1f390ba':
Update javadoc
2012-10-15 14:26:15 -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
227f782b4f
am 288c3280: am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev
...
* commit '288c32805bec0c376c111bd9851b677c00e78afd':
Protect more service dump() methods.
2012-10-15 14:08:45 -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
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
70dbc7d919
am 33856c19: am 5d0a560c: am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
...
* commit '33856c19dfa9a527b076f467e68b0c6f575d998b':
delay onDreamingStarted() to work around asynchrony.
2012-10-15 09:12:35 -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
Fergus Henderson
3794a3cad8
Merge "SynthesisCallback documentation update"
2012-10-15 05:18:06 -07:00
Przemyslaw Szczepaniak
a6e16b86b9
SynthesisCallback documentation update
...
Clarification about when android.speech.tts.SynthesisCallback.done()
should be called.
Bug: 2481825
Change-Id: Ic781a6facc2d9acb3f06afb952fbac0b494c56cf
2012-10-15 13:07:11 +01:00
Jim Miller
41d7372a72
am c866b801: am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard
...
* commit 'c866b8013a6dd5e7c95f8a197170904f753033ea':
Minor layout tweaks and bug fix in keyguard
2012-10-15 02:35:31 -07:00
Jim Miller
c866b8013a
am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard
...
* commit '1deaf3c710c54a23ace35e1f5c1718591133b681':
Minor layout tweaks and bug fix in keyguard
2012-10-15 02:32:48 -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
f2ce7735cb
am bd95bd21: am 63b977de: am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev
...
* commit 'bd95bd212a69be59f74b9cc5f3c76617a4a21833':
Fixing issues with pattern recovery / account view (issue 7341237):
2012-10-15 01:04:41 -07:00
Jim Miller
bd95bd212a
am 63b977de: am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev
...
* commit '63b977de7e7cba17ba8abd78f7750d4bc56c8c45':
Fixing issues with pattern recovery / account view (issue 7341237):
2012-10-15 01:02:39 -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
dd17fb79a6
am 57ca4d85: am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
...
* commit '57ca4d85be25f4715573f42fb8cd61123e551a88':
Fix keyguard dimensions; IME state for password view; layouts
2012-10-13 01:50:27 -07:00
Adam Powell
57ca4d85be
am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
...
* commit '13b82d668db5013ff9aa6a2e471a821d31799bfe':
Fix keyguard dimensions; IME state for password view; layouts
2012-10-13 01:47:53 -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
fa87109c56
am 75cf582c: am eda02c7e: am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
...
* commit '75cf582c028ffe179521825a1908cd747f190a33':
Fix offsets for glowpad on keyguard
2012-10-12 20:03:44 -07:00
Adam Powell
75cf582c02
am eda02c7e: am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
...
* commit 'eda02c7e3204a5e6dfdac8fb84c61a112fdc6823':
Fix offsets for glowpad on keyguard
2012-10-12 20:01:45 -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
58072b573d
am df4bcd6a: am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev
...
* commit 'df4bcd6a36ae2e0248791f35c10f6f100543b2c6':
Fix bug #7334966 Padding is still broken in RTL languages
2012-10-12 18:32:29 -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
8a8881916e
am a1672140: am d3036f7e: am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev
...
* commit 'a16721402b20dd0c53e54aa2fe274a283e9d7dbd':
use BufferedInputStream in readTextFile
2012-10-12 16:35:16 -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
Adam Powell
282b530c63
am 1b22d8b8: am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev
...
* commit '1b22d8b8ff3b2d78eab69df12abfe8ea8bea662d':
Align carrier info for glowpad keyguard screen
2012-10-12 15:18:50 -07:00
Adam Powell
1b22d8b8ff
am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev
...
* commit 'a1a51272eddc842277e4ec10bdd3fed9b16ce866':
Align carrier info for glowpad keyguard screen
2012-10-12 15:16:19 -07: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
c54f3eade9
am 9078e39b: am 92eed99c: am 95cccb9d: Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev
...
* commit '9078e39b83b000e2508c855d60dfcf99469b3c6d':
Make all lockscreen widgets follow haptic flag.
2012-10-12 15:06:35 -07:00
Jeff Sharkey
9078e39b83
am 92eed99c: am 95cccb9d: Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev
...
* commit '92eed99c09e7dead80377cff02b8a11e82049d09':
Make all lockscreen widgets follow haptic flag.
2012-10-12 15:03:48 -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