Dianne Hackborn
a8e46828bf
am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"
...
* commit 'c99e6ee202ba9d895c96f034643fd39a035ea7f2':
Fix dumpPowerState method
2012-06-08 18:55:56 -07:00
Dianne Hackborn
c99e6ee202
am c9aa32e9: Merge "Fix dumpPowerState method"
...
* commit 'c9aa32e93f39f84033e4ac812efec662a1f824ac':
Fix dumpPowerState method
2012-06-08 18:51:11 -07:00
Dianne Hackborn
c9aa32e93f
Merge "Fix dumpPowerState method"
2012-06-08 18:33:48 -07:00
Victoria Lease
2203fab249
am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev
...
* commit '2e6f9be5633cf37223425b9b93c0b1512db091af':
Fix fake bold for fallback fonts in frameworks.
2012-06-08 17:29:56 -07:00
Victoria Lease
2e6f9be563
Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev
2012-06-08 17:27:28 -07:00
Eric Fischer
4bdf62727e
am d9038fd5: Import translations. DO NOT MERGE
...
* commit 'd9038fd5568522abea033f2b826823f197c2a970':
Import translations. DO NOT MERGE
2012-06-08 16:41:34 -07:00
Eric Fischer
d9038fd556
Import translations. DO NOT MERGE
...
Change-Id: I0edaecd41cef0eb158d003a3a0aafe28f49949f7
2012-06-08 16:31:51 -07:00
Jean-Baptiste Queru
3e751f1b7b
am 60c77212: am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners"
...
* commit '60c7721210d327a464fdc95dbbe504e8eb10525c':
MountService: unlink death notification when unregistering listeners
2012-06-08 15:36:41 -07:00
Brian Colonna
c95f249ea9
am 5ebf04cc: Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev
...
* commit '5ebf04cce420ca8f32270245189c4d71f28cfd27':
Bug 6605167: Turning off FUL during error counts as attempt
2012-06-08 15:30:47 -07:00
Jean-Baptiste Queru
60c7721210
am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners"
...
* commit '2a393a99dc9612516dd9efbf74b6b5924d7d608a':
MountService: unlink death notification when unregistering listeners
2012-06-08 15:28:39 -07:00
Brian Colonna
5ebf04cce4
Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev
2012-06-08 14:45:11 -07:00
Jean-Baptiste Queru
4fe782d2a2
am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
...
* commit '69e28c2ff7b46a05bf5b60cae59dbaf86ad2ad7f':
stagefright aacenc: Add parentheses in expression with mixed && and ||
2012-06-08 14:34:28 -07:00
Jean-Baptiste Queru
2a393a99dc
Merge "MountService: unlink death notification when unregistering listeners"
2012-06-08 14:30:52 -07:00
Jean-Baptiste Queru
69e28c2ff7
am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
...
* commit 'ce4de8d141386ade1f184aa1b56fff7d3097dc3f':
stagefright aacenc: Add parentheses in expression with mixed && and ||
2012-06-08 14:19:17 -07:00
Jean-Baptiste Queru
ce4de8d141
Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
2012-06-08 14:10:11 -07:00
Kenny Root
3a3c7e7bc4
am 63dd4c65: am 60b3d59d: Merge "Modify installd to set the SELinux security context on package directories."
...
* commit '63dd4c65c41187967ba0828d386117f90020840e':
Modify installd to set the SELinux security context on package directories.
2012-06-08 14:01:54 -07:00
Kenny Root
d26f7139a7
Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp
2012-06-08 13:59:21 -07:00
Victoria Lease
b26fa0ce68
Fix fake bold for fallback fonts in frameworks.
...
This change is analogous to Ic0e9f1bbd8cae9fdd3a6d1d015bb9224c8be545c
in WebView, and depends upon the same Skia change that that CL makes
use of.
This flips the "fake bold" flag on for bold fonts in
TextView.setTypeface(), with the expectation that Skia will ignore
the flag if the final typeface used to render the glyphs is already
bold. It also does the same for StyleSpans, TextAppearanceSpans,
TypefaceSpans, and the Switch widget.
With this, fake bold should work uniformly across all scripts - if
fake bold works for a primary typeface, it should also work for all
fallback typefaces.
Bug: 6629786
Change-Id: Id3b8639ab0df83052ffd82809cb12adaacc1d46b
2012-06-08 13:52:17 -07:00
Irfan Sheriff
efcc0ca754
am 4206ee2b: Merge "Fix clear services API" into jb-dev
...
* commit '4206ee2b680fb2c273c03efc9083e327c7051121':
Fix clear services API
2012-06-08 13:48:14 -07:00
Kenny Root
e38b1c4d15
resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp
...
Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f
2012-06-08 13:47:46 -07:00
Irfan Sheriff
4206ee2b68
Merge "Fix clear services API" into jb-dev
2012-06-08 13:45:19 -07:00
Daniel Sandler
4dc0cf7bf3
am 6cf0c336: Merge "Various notification template cleanups." into jb-dev
...
* commit '6cf0c3365a40854f63f0abff2fa67d24432d0218':
Various notification template cleanups.
2012-06-08 13:40:05 -07:00
Daniel Sandler
6cf0c3365a
Merge "Various notification template cleanups." into jb-dev
2012-06-08 13:38:02 -07:00
Craig Mautner
af2ab39aba
am 78fc35bd: Merge "Hide wallpaper when wallpaper target gets hidden." into jb-dev
...
* commit '78fc35bde452c2fea18ecf9d8aeedee6d82ba1eb':
Hide wallpaper when wallpaper target gets hidden.
2012-06-08 13:18:13 -07:00
Craig Mautner
78fc35bde4
Merge "Hide wallpaper when wallpaper target gets hidden." into jb-dev
2012-06-08 13:14:54 -07:00
Kenny Root
63dd4c65c4
am 60b3d59d: Merge "Modify installd to set the SELinux security context on package directories."
...
* commit '60b3d59d7f788046a45a5fd4e97ec7235fb55787':
Modify installd to set the SELinux security context on package directories.
2012-06-08 13:09:15 -07:00
Kenny Root
9855f6e210
am 7b2d0563: Merge "Add JNI bindings for some of the libselinux interfaces."
...
* commit '7b2d056342176b5e7ff19842fc9202f2f8d36b76':
Add JNI bindings for some of the libselinux interfaces.
2012-06-08 13:09:12 -07:00
Craig Mautner
ff92f04e76
Hide wallpaper when wallpaper target gets hidden.
...
Another location that potentially hides the wallpaper target while
leaving the wallpaper itself still visible. Causes the wallpaper to
show up when upper surfaces are transparent all the way down.
Fixes bug b6621986.
Change-Id: If75053160f041eb78868eda36b7820fb2110d069
2012-06-08 12:56:14 -07:00
Craig Mautner
1189f855e6
am 7f786b8f: Merge "Do not animate keyboard and button brightness." into jb-dev
...
* commit '7f786b8fa20619dcd69324c521cb59242a8f2944':
Do not animate keyboard and button brightness.
2012-06-08 12:49:57 -07:00
Craig Mautner
7f786b8fa2
Merge "Do not animate keyboard and button brightness." into jb-dev
2012-06-08 12:48:19 -07:00
Raph Levien
0c70d4fff2
am 8325eee0: Merge "Workaround for bug 6609605: Hindi rendering regression in WebView" into jb-dev
...
* commit '8325eee0c29a6497b33c4b2cb32e242625186a70':
Workaround for bug 6609605: Hindi rendering regression in WebView
2012-06-08 12:42:11 -07:00
Raph Levien
8325eee0c2
Merge "Workaround for bug 6609605: Hindi rendering regression in WebView" into jb-dev
2012-06-08 12:40:10 -07:00
Kenny Root
60b3d59d7f
Merge "Modify installd to set the SELinux security context on package directories."
2012-06-08 12:27:42 -07:00
Kenny Root
7b2d056342
Merge "Add JNI bindings for some of the libselinux interfaces."
2012-06-08 12:25:07 -07:00
Craig Mautner
6aabf8d7c7
am fab75dc8: Merge "Turn off dimming immediately for removed windows." into jb-dev
...
* commit 'fab75dc830039b5aa1463aea55ceee2de279ec52':
Turn off dimming immediately for removed windows.
2012-06-08 11:39:12 -07:00
Craig Mautner
fab75dc830
Merge "Turn off dimming immediately for removed windows." into jb-dev
2012-06-08 11:36:36 -07:00
Chris Wren
87efc0ac2e
am 7cd46429: Merge "apply Jellybean styling to tablet system bar and panel" into jb-dev
...
* commit '7cd464292bc1012a46479898b0ee69c5e38dfe35':
apply Jellybean styling to tablet system bar and panel
2012-06-08 11:29:12 -07:00
Chris Wren
7cd464292b
Merge "apply Jellybean styling to tablet system bar and panel" into jb-dev
2012-06-08 11:26:22 -07:00
Dianne Hackborn
33e39aefdf
am 0876ab0a: Merge "Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has..." into jb-dev
...
* commit '0876ab0ac17518c479e9dffe025884870a586d9c':
Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has...
2012-06-08 11:04:13 -07:00
Dianne Hackborn
0876ab0ac1
Merge "Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has..." into jb-dev
2012-06-08 11:01:42 -07:00
Jean-Baptiste Queru
0237d04b95
am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"
...
* commit '644e43e06ffa5b493ca3682c24b8db606deed664':
Added mpga as valid MediaFile extension
2012-06-08 10:57:12 -07:00
Jean-Baptiste Queru
644e43e06f
am 3e3d641c: Merge "Added mpga as valid MediaFile extension"
...
* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
Added mpga as valid MediaFile extension
2012-06-08 10:53:40 -07:00
Jean-Baptiste Queru
3e3d641c61
Merge "Added mpga as valid MediaFile extension"
2012-06-08 10:20:57 -07:00
Raph Levien
13f6e7c819
Workaround for bug 6609605: Hindi rendering regression in WebView
...
This patch changes the font data so that all anchor points are in
absolute coordinates, rather than relative to outline points. With
the workaround, we don't trigger the bug in the HarfBuzz/Skia
integration that causes incorrect outline point data to be read.
The font was prepared with FontForge. There's some risk of other
problems, but I tested the font fairly carefully and it looks fine.
(With a version prepared in TTX, the substitution of the different
width forms of the ivowelsigndeva got broken, likely due to a TTX
bug, as this seems to happen with roundtrip of unedited original).
Change-Id: I3f6fffce91c3ea0695e6005b051bcf4e9b6f6361
2012-06-08 10:17:23 -07:00
Adam Powell
bd0edb479f
am f2427580: Merge "Progress bar assets - once more, with feeling!" into jb-dev
...
* commit 'f2427580732b3651fb97ac4859334718d2260d15':
Progress bar assets - once more, with feeling!
2012-06-08 10:14:12 -07:00
Adam Powell
f242758073
Merge "Progress bar assets - once more, with feeling!" into jb-dev
2012-06-08 10:11:40 -07:00
Craig Mautner
236a35b77a
Turn off dimming immediately for removed windows.
...
Dimming was only turning off immediately for app-animated windows.
For removed windows dimming wouldn't turn off until the window was
completely gone.
Fixes bug 6628057.
Change-Id: I3ba6501b10a31b6f8c91012e17ad8734a84050c4
2012-06-08 09:54:59 -07:00
Kenny Root
f549099705
am af95137a: Merge "Whoops, this version number wasn\'t updated when JB was introduced!" into jb-dev
...
* commit 'af95137a9f48710d8356c5f33334b9ce60f2fb68':
Whoops, this version number wasn't updated when JB was introduced!
2012-06-08 09:53:49 -07:00
Kenny Root
af95137a9f
Merge "Whoops, this version number wasn't updated when JB was introduced!" into jb-dev
2012-06-08 09:51:04 -07:00
Irfan Sheriff
96aa0db9a9
Fix clear services API
...
BUg: 6631291
Change-Id: I9cee827b5eb78e356fdf86390103136f5610dd3e
2012-06-08 09:24:33 -07:00