151445 Commits

Author SHA1 Message Date
Chet Haase
014e14b242 Fix behavior of inflating InsetDrawable
A recent change to InsetDrawable changed the behavior of inflating
an InsetDrawable when it already had a valid bitmap. The new behavior
avoids throwing an exception with a bad resource where it used to
throw, because the existence of the bitmap makes it avoid trying to
load the resource at all.

The fix is to reintroduce the old behavior of forcing it to load the
resource regardless of the state of its bitmap.

Issue #17068252 InsetDrawable inflation CTS test is failing

Change-Id: I941388730d4479f8f4747a7985754ffdf5133f04
2014-09-02 16:28:48 -07:00
Jungshik Jang
e8f8bc0ad6 Merge "Make stream_music volume configurable." into lmp-dev 2014-09-02 23:20:32 +00:00
Adam Powell
12b0321c0b Automatically supply a content description for ToolbarActionBar nav
If the developer hasn't set a navigation content description on the
Toolbar assigned to be an action bar or a home-action content
description via the ActionBar interface, use the framework default
"navigate up" string.

Also make sure that the default Up description is supplied in the
screen_toolbar window decor layout and that it is parsed properly in
all toolbars, even if we don't have an icon set during construction.

Bug 17298370

Change-Id: Ie2f9e34f92046d4d4ffb9a07e38fa89581891f7b
2014-09-02 16:20:08 -07:00
John Reck
84b8d1ae8e am efb75031: Merge "Implement TODO" into lmp-dev
* commit 'efb75031e7eac8ee84ca6202dcddd39149d78980':
  Implement TODO
2014-09-02 23:09:59 +00:00
John Reck
3d3f5f8c68 Merge "Implement TODO" into lmp-dev 2014-09-02 22:58:51 +00:00
Alan Viverette
a8a8ff000b Remove partial support for hotspot changes on focus movement
Also removes unused x/y position and tween values on RippleBackground. The
background is now always centered within the hotspot area.

BUG: 17300399
Change-Id: I1904c9f44e6bebb2b434d2b092205edd42204263
2014-09-02 15:58:03 -07:00
Dianne Hackborn
7e40b9519b am a7260b84: Merge "And yet more logging for slow execution." into lmp-dev
* commit 'a7260b847f4bf285d7e56b6728f867845f2fc788':
  And yet more logging for slow execution.
2014-09-02 22:57:27 +00:00
Lorenzo Colitti
7498871821 am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev
* commit '910113a91cc62b5840f107f9b41e4a6445d2a155':
  Use per-Network connection pools for openConnection.
2014-09-02 22:53:03 +00:00
Lorenzo Colitti
91396a3577 am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
* commit '2c0a5509a7d74c013e63b7056679394811b5e984':
  Pass the socket mark for DNS queries to dnsmasq.
2014-09-02 22:52:58 +00:00
Dianne Hackborn
526b642290 Merge "And yet more logging for slow execution." into lmp-dev 2014-09-02 22:49:38 +00:00
Alan Viverette
416387763c Don't clip preference row icons to padding
Need negative margins to align the 48dp icons correctly with Material
layout guidelines and still respect listPreferredItemPaddingStart.

BUG: 17316340
Change-Id: I2d3baa4cd2857fb73a65eba3447de33d7319b6df
2014-09-02 15:46:18 -07:00
John Reck
1661715d40 Implement TODO
Change-Id: I551ad0dab6356baa4c7787718b54d5b7337a3f26
2014-09-02 15:44:14 -07:00
Lorenzo Colitti
ca2f20deaa Merge "Use per-Network connection pools for openConnection." into lmp-dev 2014-09-02 22:40:10 +00:00
Lorenzo Colitti
089ea995ba Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 2014-09-02 22:39:18 +00:00
Michael Wright
b574aef3f1 am 0d35de74: am 144c21c2: (-s ours) am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve
* commit '0d35de7488a28bc60915b8f21bf630103cc80be7':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
2014-09-02 22:30:01 +00:00
Alan Viverette
c6c42c7e50 am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev
* commit '489e207dcd42e1d4e4c78d7b72138f4a094dfd79':
  Update pointer hotspots to scale for DPI
2014-09-02 22:29:56 +00:00
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
George Mount
c03da0e7a9 Make Fragment Transitions match Acitivty Transitions API
Bug 17188255

Change-Id: I506a097be4010d7156caf465c95295c58612c16e
2014-09-02 15:15:12 -07: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
Jorim Jaggi
5172dc2f36 Status bar iconography updates
- Use new assets for location, flightmode and "more" notifications
  icon.
- Update icon size and clock to spec.
- Change from fixed width of the icons to WRAP_CONTENT, so they look
  more evenly distributed.
- Adjust subpixel rendering of battery icon to match other vector
  icons.

Bug: 16161255
Change-Id: I0a80f223b7d532bc53a201cff37b8f1cb09f08c2
2014-09-02 23:52:48 +02: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
Jason Monk
f1c9c23e6a Correct hotspot notification asset
Bug: 17318568
Change-Id: I643ed22547370eef6f4b91f37ec9496e09428112
2014-09-02 16:39:15 -04: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
ASAZU, Hideki
dbd6abaf5f New keycode definitions for TV remotes.
Keys which are necessary for supporting world-wide broadcast
standard or used commonly for TV/STB remotes.

Change-Id: I86fa41e17fedb8133aba6cdb5aae4d560b31ae8e
2014-09-02 13:34:44 -07:00
Jorim Jaggi
4dc653aaa2 Merge "Fix outdated time when turning on screen" into lmp-dev 2014-09-02 20:26:39 +00:00
Jean-Michel Trivi
859f4f7272 Merge "Restore permission check for mic muting" into lmp-dev 2014-09-02 20:23:00 +00:00