Michael Wright
17516155d7
am 144c21c2: (-s ours) am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve
...
* commit '144c21c2a063981efe942f98c4fa22ebd5f728fc':
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
2014-09-02 22:24:30 +00:00
Alan Viverette
d379361ecb
Merge "Update pointer hotspots to scale for DPI" into lmp-dev
2014-09-02 22:20:12 +00:00
Alan Viverette
be0dd99bac
Make sure ripple background bounds are used for invalidation
...
BUG: 17349157
Change-Id: Ie88fbabbc66349aea9b7d00e28ca12f93776a4a7
2014-09-02 15:05:27 -07:00
Dianne Hackborn
fae8cbfe90
am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev
...
* commit '8070053f6266c98bcffca335b4642d415638b05c':
Add public constant for usage stats app op.
2014-09-02 22:04:12 +00:00
Raph Levien
44a233952e
am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev
...
* commit '2e97ac0cccdb8625385dc2373ce1a0d8e5f18b2c':
Ensure layout in getExtendedPadding calls
2014-09-02 22:04:08 +00:00
Craig Mautner
cb31188b0a
am 2d94c706: Merge "Account for scaling effects when cropping" into lmp-dev
...
* commit '2d94c706439c2d492d60dd9a77fd6643e8a1bb23':
Account for scaling effects when cropping
2014-09-02 22:04:03 +00:00
Svet Ganov
825b432151
am 668b4765: Merge "Move print rendering in an isolated process." into lmp-dev
...
* commit '668b4765de3e97d69aaebb3bd58fe23eb800264d':
Move print rendering in an isolated process.
2014-09-02 22:03:58 +00:00
Adrian Roos
38778c170c
am be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev
...
* commit 'be31021b4360f28e49da0bb654103520c9a2ad43':
Disable touch dispatch while adjusting brightness
2014-09-02 22:03:53 +00:00
Shri Borde
26664a0a09
am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev
...
* commit 'fb90979054c6800b00b8c4e2890f04f055b4077e':
Bug 17243357: Remove MessagingConfigurationManager
2014-09-02 22:03:49 +00:00
Michael Wright
144c21c2a0
am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve
...
* commit 'da3b43633fe86d69aab5cab52826e76e01f18d63':
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
2014-09-02 22:02:23 +00:00
Dianne Hackborn
7b7b754fab
Merge "Add public constant for usage stats app op." into lmp-dev
2014-09-02 21:54:56 +00:00
Raph Levien
4c5ea10caf
Merge "Ensure layout in getExtendedPadding calls" into lmp-dev
2014-09-02 21:53:26 +00:00
Craig Mautner
980d466342
Merge "Account for scaling effects when cropping" into lmp-dev
2014-09-02 21:53:03 +00:00
Svet Ganov
561b893174
Merge "Move print rendering in an isolated process." into lmp-dev
2014-09-02 21:51:47 +00:00
Adrian Roos
8c8fbcf358
Merge "Disable touch dispatch while adjusting brightness" into lmp-dev
2014-09-02 21:51:47 +00:00
Shri Borde
ffc150ebed
Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev
2014-09-02 21:48:10 +00:00
Michael Wright
da3b43633f
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
...
Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.
Bug: 15611140
Change-Id: I308ad00943d916866ee8d2507a41b7032e6b524e
2014-09-02 14:47:37 -07:00
Adrian Roos
8edffdf1e9
am c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev
...
* commit 'c51688f7c59890f31ffd8a6b79c083e4659dd087':
Don't drop up or cancel touch events
2014-09-02 21:44:34 +00:00
Adrian Roos
9dc3209913
Disable touch dispatch while adjusting brightness
...
Prevents new pointers from being added while the shade
is transparent so that nothing gets touched by accident.
Bug: 17113634
Change-Id: I4a607d08dbccd467280159060846edd32db9c512
2014-09-02 23:38:59 +02:00
Craig Mautner
78505d8d09
Account for scaling effects when cropping
...
When a scaled window inherits the crop from an attached animating
window the scaling must be accounted for or the crop will obscure
the scaled window.
In the case of the bug that this CL fixes, the SurfaceView containing
a video was scaled down from 1920x1080 by a factor of 0.562 to fit in
1080 width. The crop applied to the window was 1080 but this was passed
to surfaceflinger which ended up cropping the width to 608 due to the
scaling.
Applying the scaling factor to the crop rectangle fixes this bug.
Fixes bug 16334217.
Change-Id: Iafefe43d3696d9fbff01a3666096348468a41e1a
2014-09-02 14:36:31 -07:00
Adrian Roos
38b4670d46
Merge "Don't drop up or cancel touch events" into lmp-dev
2014-09-02 21:35:59 +00:00
Dianne Hackborn
36927a3600
And yet more logging for slow execution.
...
Change-Id: Idd485d3b4339e22a38fd688cbd435818ca38d233
2014-09-02 14:32:02 -07:00
Raph Levien
463cf1aea8
Ensure layout in getExtendedPadding calls
...
There are cases in which getExtendedPaddingTop() and Bottom can get
called even without a valid layout. This patch just makes sure there
is some reasonable layout available.
Fix for bug 14819392 "java.lang.NullPointerException in
android.widget.TextView"
Change-Id: I203899402ddfe857a688b16b7855a8991eee82b7
2014-09-02 14:23:18 -07:00
Adrian Roos
ce5474b837
Don't drop up or cancel touch events
...
Otherwise you're gonna have a bad time.
Bug: 17113634
Change-Id: I24fa13a4379bab0cef014010058d08096abda094
2014-09-02 23:19:56 +02:00
Yohei Yukawa
cc24e2b6a2
API Review: CursorAnchorInfo
...
This CL introduces following combinable flags as a replacement
of CHARACTER_RECT_TYPE_* constants.
- CursorAnchorInfo.FLAG_HAS_VISIBLE_REGION
- CursorAnchorInfo.FLAG_HAS_INVISIBLE_REGION
This CL also replaces #isInsertionMarkerClipped() with
flags.
Rationale:
getCharacterRectFlags() should return a set of flags, rather
than enum-like types.
getInsertionMarkerFlags() is more consistent with
getCharacterRectFlags() than isInsertionMarkerClipped().
It is also open for future extension.
BUG: 17200900
Change-Id: Ia8cbb9f6b41cd9509fc0147fd68763dfde593ffc
2014-09-02 14:08:39 -07:00
Shri Borde
7237972bff
Bug 17243357: Remove MessagingConfigurationManager
...
It is replaced with SmsManager.getCarrierConfigValues
Change-Id: I560a53427b08746f2a7ed2e540ecb2c978b7ebd0
2014-09-02 14:00:21 -07:00
Jorim Jaggi
040787ebaa
am 4381bd8c: am d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev
...
* commit '4381bd8cb57c26e2b3f5d2eb09783917357ab6b9':
Fix outdated time when turning on screen
2014-09-02 20:46:25 +00:00
Jean-Michel Trivi
091c909180
am 22a14cd2: am 73db0682: Merge "Restore permission check for mic muting" into lmp-dev
...
* commit '22a14cd2d8d3fb0e5a9bd8bf9d6ecf1467c0579c':
Restore permission check for mic muting
2014-09-02 20:46:20 +00:00
Jorim Jaggi
29ff450cd6
am d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev
...
* commit 'd9a773e51e6fcf7abbbcfd2c145e7e4e16c1282d':
Fix outdated time when turning on screen
2014-09-02 20:36:04 +00:00
Jean-Michel Trivi
205978b2d7
am 73db0682: Merge "Restore permission check for mic muting" into lmp-dev
...
* commit '73db06820184c39c4e50e5be268a9e0f213a1a99':
Restore permission check for mic muting
2014-09-02 20:35:59 +00:00
Jorim Jaggi
4dc653aaa2
Merge "Fix outdated time when turning on screen" into lmp-dev
2014-09-02 20:26:39 +00:00
Mathieu Chartier
a31a411462
am d3f31288: am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev
...
* commit 'd3f312885208afca1d195fd5ac9059dd66dcb689':
Add missing null check to ninePatchInsets
2014-09-02 20:26:11 +00:00
Selim Cinek
f80e7c9d62
am c82d8bb0: am 77258e4a: Merge "Notifications are now selectable by the Keyboard" into lmp-dev
...
* commit 'c82d8bb05d868c63d77439f9876a5c4670549c1b':
Notifications are now selectable by the Keyboard
2014-09-02 20:26:06 +00:00
Jorim Jaggi
0f1b3bdc64
am 96cfaf50: am a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev
...
* commit '96cfaf50e14ecae7865de62d34d383b3cfc3578c':
Remove different layout for landscape in Keyguard
2014-09-02 20:26:02 +00:00
Jean-Michel Trivi
859f4f7272
Merge "Restore permission check for mic muting" into lmp-dev
2014-09-02 20:23:00 +00:00
Mathieu Chartier
a81d660b9c
am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev
...
* commit 'b980f4607d67ccafb43d86e5fd7b35806b65acfa':
Add missing null check to ninePatchInsets
2014-09-02 20:14:25 +00:00
Selim Cinek
d7d9c4c975
am 77258e4a: Merge "Notifications are now selectable by the Keyboard" into lmp-dev
...
* commit '77258e4a2349afa72f3110407717d5f090c22106':
Notifications are now selectable by the Keyboard
2014-09-02 20:14:20 +00:00
Jorim Jaggi
57cc95bce3
am a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev
...
* commit 'a63992888988017f664cc4c33ea1f0d546959b9d':
Remove different layout for landscape in Keyguard
2014-09-02 20:14:15 +00:00
Mathieu Chartier
8c94a8f280
Merge "Add missing null check to ninePatchInsets" into lmp-dev
2014-09-02 20:07:05 +00:00
Jorim Jaggi
d09def7511
Fix outdated time when turning on screen
...
Force a synchronous update of the clock view when turning on the
screen. Also wait for the Keyguard window to be drawn when turning
on the screen.
Bug: 16904617
Change-Id: I38f78a38cfe35ccd067cd420d2bad626bd955ad6
2014-09-02 22:05:42 +02:00
Selim Cinek
58703e651c
Merge "Notifications are now selectable by the Keyboard" into lmp-dev
2014-09-02 20:01:07 +00:00
Jorim Jaggi
4b149860b8
Merge "Remove different layout for landscape in Keyguard" into lmp-dev
2014-09-02 20:01:03 +00:00
Dianne Hackborn
71eb4b187b
am 3180e01c: am 30ccac80: Merge "Fix issue #17322903 : Crash in systemUI while launching an app from recents tab" into lmp-dev
...
* commit '3180e01c59c78da8a8a7315f6b67b36ea09b0175':
Fix issue #17322903 : Crash in systemUI while launching an app from recents tab
2014-09-02 19:54:30 +00:00
Jorim Jaggi
e82f90e72e
Remove different layout for landscape in Keyguard
...
Bug: 15422177
Change-Id: I8a643a8f6dcfed1530f17e8de6a5cc69533528b4
2014-09-02 21:54:25 +02:00
Chris Craik
de33841317
am 0d1a3fd3: am f9b26725: Merge "Fix precision issues for roundrect clipping" into lmp-dev
...
* commit '0d1a3fd3b846d858c321c634b605fd9fc63b57cd':
Fix precision issues for roundrect clipping
2014-09-02 19:54:24 +00:00
Dianne Hackborn
2becc22070
am 30ccac80: Merge "Fix issue #17322903 : Crash in systemUI while launching an app from recents tab" into lmp-dev
...
* commit '30ccac80f90d40db58d76e94ee658e05035df484':
Fix issue #17322903 : Crash in systemUI while launching an app from recents tab
2014-09-02 19:50:20 +00:00
Chris Craik
caa0f6622d
am f9b26725: Merge "Fix precision issues for roundrect clipping" into lmp-dev
...
* commit 'f9b26725a75e3793f0c0805a25e1e2e4c0974cce':
Fix precision issues for roundrect clipping
2014-09-02 19:39:18 +00:00
Dianne Hackborn
c8838dfbec
Merge "Fix issue #17322903 : Crash in systemUI while launching an app from recents tab" into lmp-dev
2014-09-02 19:38:25 +00:00
Chris Craik
0fd79c955b
Merge "Fix precision issues for roundrect clipping" into lmp-dev
2014-09-02 19:25:09 +00:00
Tsuwei Chen
9b657a6a88
am ad8eface: am 1c1a2cc9: Merge "Reload GPS configuration after carrier info is available. Bug: 17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev
...
* commit 'ad8eface55f8184eabbecc2b68f3901724bc3a87':
Reload GPS configuration after carrier info is available. Bug: 17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
2014-09-02 19:14:03 +00:00