Amith Yamasani
f0bb0f4e7d
am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev
...
* commit 'a87826c345dbd692a86a340691cf7471a2505809':
Fix face unlock for multiple users
2012-09-14 14:14:01 -07:00
Amith Yamasani
a87826c345
Merge "Fix face unlock for multiple users" into jb-mr1-dev
2012-09-14 14:11:58 -07:00
Kristian Monsen
cdd2dd58d8
am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev
...
* commit '4cb846b8defa298fe62e6420d1dcd7d8f65a1d74':
Hiding some of the deprecated android.webkit API's
2012-09-14 14:03:59 -07:00
Ben Gruver
ff02582a3b
am 51fbaff1: Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
...
* commit '51fbaff11c195d3004f872d19f98a20fa6c44456':
DEFAULT_VERIFY_ENABLE turns verification off
2012-09-14 14:03:56 -07:00
Winson Chung
dda3f13f52
am 4f49d945: Adding data type overlay to network tile.
...
* commit '4f49d9450fe919868f9a9a9a44db59ca2497150c':
Adding data type overlay to network tile.
2012-09-14 14:02:10 -07:00
Winson Chung
4f49d9450f
Adding data type overlay to network tile.
...
Change-Id: Iae3c188e2f7f03bd1ebaddc756021be312ddb0aa
2012-09-14 14:02:07 -07:00
Kristian Monsen
4cb846b8de
Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev
2012-09-14 14:01:37 -07:00
Ben Gruver
51fbaff11c
Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
2012-09-14 14:01:37 -07:00
Jeff Sharkey
d0f5607e76
am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
...
* commit '04a34b375513eaeec67f54bb203ef6b763328751':
Actually move to Global settings.
2012-09-14 13:51:19 -07:00
Jeff Sharkey
04a34b3755
Merge "Actually move to Global settings." into jb-mr1-dev
2012-09-14 13:49:24 -07:00
Christopher Tate
b808ce2307
am ce18d1c8: Merge "Get correct user\'s package info during clip processing" into jb-mr1-dev
...
* commit 'ce18d1c871f7101af58391918b7f249438c4c307':
Get correct user's package info during clip processing
2012-09-14 13:48:36 -07:00
Jeff Sharkey
e6e6197d7c
Actually move to Global settings.
...
Also add better ConnectivityService logging.
Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Christopher Tate
ce18d1c871
Merge "Get correct user's package info during clip processing" into jb-mr1-dev
2012-09-14 13:44:52 -07:00
Christopher Tate
ad9833a77f
Get correct user's package info during clip processing
...
Also clear the binder identity correctly for purposes of doing
that query.
Bug 7162477
Change-Id: Ie9e43a2d8fc964d1be649887905244dcceaa3c80
2012-09-14 13:43:16 -07:00
Roozbeh Pournader
f387517725
Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]
...
Persian was missing data for day_of_week_medium_* and day_of_week_short_*,
resulting in fallbacks to English.
Bug: 6811501
Change-Id: Ib321a964221e451d8b47e2eb025fad8a02f0d5c0
2012-09-14 13:43:02 -07:00
rich cannings
e4bf0eae06
DEFAULT_VERIFY_ENABLE turns verification off
...
When DEFAULT_VERIFY_ENABLE == false, package verification must be completely
off.
Bug: 7132197
Change-Id: Icc0dbb4a3f4f5f00ddadecda6cc42976618c4332
2012-09-14 13:40:30 -07:00
Amith Yamasani
4b4b954ddf
Fix face unlock for multiple users
...
Bug: 7152537
Not all instances of LockPatternUtils are getting updated with the current user, so
query it directly from the Activity Manager.
Change-Id: I46395c3e00feecd0edfe4228f8d7966f425519f2
2012-09-14 13:36:29 -07:00
Jeff Sharkey
d3941f4c33
am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
...
* commit 'a043c2c0534afe418fc39bdb43bfaab394ba821a':
Move to Global.NETSTATS and Global.NTP constants.
2012-09-14 13:17:46 -07:00
Jeff Sharkey
a043c2c053
Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
2012-09-14 13:15:16 -07:00
Jeff Sharkey
023c05a341
Move to Global.NETSTATS and Global.NTP constants.
...
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
Baligh Uddin
4a0c3b1ff0
Import translations. DO NOT MERGE
...
Change-Id: Ie3512f874a89b0d99d4533a9d0620aaa5b85b555
Auto-generated-cl: translation import
2012-09-14 12:51:51 -07:00
Jim Miller
76d795c313
am f229e4d3: Add support for settings for lock widgets
...
* commit 'f229e4d3eb8f910c181f96416c6798f6f305a395':
Add support for settings for lock widgets
2012-09-14 12:40:05 -07:00
Baligh Uddin
673e7b7500
Import translations. DO NOT MERGE
...
Change-Id: Ifb01887900c080dcc8d7942e97fd3cc9e871d34a
Auto-generated-cl: translation import
2012-09-14 12:35:58 -07:00
Jim Miller
f229e4d3eb
Add support for settings for lock widgets
...
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Winson Chung
dfc03e63de
am 49321ec4: Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev
...
* commit '49321ec4fb30ab0c709c1e808701f63f38f8cbe7':
Suppress ExpandHelper on quick settings.
2012-09-14 12:29:45 -07:00
Winson Chung
9f3b9a138b
am d4726d06: Adding rotation lock tile to quick settings (on tablets).
...
* commit 'd4726d062e277b360046609f35e1aa8572e8e364':
Adding rotation lock tile to quick settings (on tablets).
2012-09-14 12:29:39 -07:00
Winson Chung
d4726d062e
Adding rotation lock tile to quick settings (on tablets).
...
Change-Id: Ia68c07051acc1f0f42dde0b1322db034b5d54506
2012-09-14 12:28:40 -07:00
Winson Chung
49321ec4fb
Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev
2012-09-14 12:27:55 -07:00
Michael Jurka
2dbb603912
am ad92ce85: Merge "Fix bug with getting widget categories" into jb-mr1-dev
...
* commit 'ad92ce85175a45e5d059f129d2e0627cae60aa82':
Fix bug with getting widget categories
2012-09-14 12:26:28 -07:00
Michael Jurka
1733eb309b
am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
...
* commit '95a2ff7cb40d5eb3ca6fe4df0282f45e63d76ae2':
Adding a couple extras keys for keyguard widget selection
2012-09-14 12:23:46 -07:00
Michael Jurka
ad92ce8517
Merge "Fix bug with getting widget categories" into jb-mr1-dev
2012-09-14 12:21:54 -07:00
Raph Levien
600eb7a697
am c1eff085: am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'c1eff0857ebc6abce48ba8c267ab32109dd45ef0':
framework: fix bug for uninitialized variable
2012-09-14 12:21:52 -07:00
Michael Jurka
95a2ff7cb4
Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
2012-09-14 12:20:08 -07:00
Raph Levien
c1eff0857e
am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'e590568417aa824e7b0e76ae727556d329cb57cf':
framework: fix bug for uninitialized variable
2012-09-14 12:19:03 -07:00
Michael Jurka
ca5e341574
Fix bug with getting widget categories
...
Change-Id: I3b0f410707d37436732c45b572c2f588427a784f
2012-09-14 12:18:51 -07:00
Raph Levien
e590568417
am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'eceb317116d87dada85d06df8fe0e07dd4aec49d':
framework: fix bug for uninitialized variable
2012-09-14 12:16:32 -07:00
Raph Levien
eceb317116
am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
framework: fix bug for uninitialized variable
2012-09-14 12:15:03 -07:00
Dianne Hackborn
5b329e8501
Fix debug log.
...
Change-Id: If65abf43ee7a455b12d49b5800657dbf4489e5b9
2012-09-14 11:54:12 -07:00
Raph Levien
f4afc40101
Merge "framework: fix bug for uninitialized variable"
2012-09-14 11:52:11 -07:00
Svetoslav Ganov
bed49f9d58
am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
...
* commit 'e136a72810197029a01b4e30b2063d9993b7a9ad':
Text layout in switch may be null when accessibility events are fired.
2012-09-14 11:39:39 -07:00
Christopher Tate
c1e27dc060
am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev
...
* commit '0dbc4108005445d241c5f6990000d25a09a8e00e':
Fix Settings writes to a different user
2012-09-14 11:37:54 -07:00
Svetoslav Ganov
e136a72810
Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
2012-09-14 11:37:15 -07:00
Svetoslav Ganov
b8c50e8e44
Text layout in switch may be null when accessibility events are fired.
...
1. The layout containing the text of a Switch is initialized on measure
and if an accessibility event is fired before that then a NPE happens.
bug:7169419
Change-Id: Iee3c01ca9157d14d228c4ff33c0810507e0e25a7
2012-09-14 11:36:29 -07:00
Christopher Tate
0dbc410800
Merge "Fix Settings writes to a different user" into jb-mr1-dev
2012-09-14 11:35:19 -07:00
Kenny Root
99b72639a2
am a96fa35e: Merge "Don\'t prematurely delete temporary files" into jb-mr1-dev
...
* commit 'a96fa35e50788d26fc8ab7667ed5000e7b67b26e':
Don't prematurely delete temporary files
2012-09-14 11:22:44 -07:00
Kenny Root
a96fa35e50
Merge "Don't prematurely delete temporary files" into jb-mr1-dev
2012-09-14 11:19:44 -07:00
Romain Guy
a938f569ce
Fix modulation and gamma correction issues
...
Modulation is normally enabled in a shader when drawing with an alpha
mask (A8 texture.) Modulation is used to do one of two things:
- Colorize the primitive (to draw text in red for instance)
- Apply extra translucency (50% translucent circle filled with a bitmap)
The current implementation has four issues:
1. Unnecessary work is performed by assigning the modulation color
to vec4 fragColor early in the shader
2. The modulation color's alpha is applied twice when the primitive
is drawn with an SkShader
3. The decision to modulate is wrong and triggers when any of the
RGB channels is < 1.0. Only the alpha channel needs to be taken
into account to make the decision
4. Gamma correction is not applied properly
This change addresses all four issues above.
Change-Id: I73fcc74efc4b094bf2d1b835f10ffaa2ea4b9eb9
2012-09-14 10:50:51 -07:00
Romain Guy
77451da220
am 494ac35c: Merge "Multiply alpha for AA as late as possible" into jb-mr1-dev
...
* commit '494ac35c27a0960f57b00bf8457f1956ecf149a2':
Multiply alpha for AA as late as possible
2012-09-14 10:37:15 -07:00
Romain Guy
494ac35c27
Merge "Multiply alpha for AA as late as possible" into jb-mr1-dev
2012-09-14 10:34:47 -07:00
Kenny Root
0b2fa8ca22
Don't prematurely delete temporary files
...
When verification and encryption is used, the temporary file was deleted
prematurely.
Also, on next boot-up, scan the directory we use for temporary files to
clean them up if the user rebooted in the middle of installation.
Bug: 7132197
Change-Id: Ic9e8aab9a664ca00d9ac16f72e53fc43d78d21bc
2012-09-14 10:34:21 -07:00