Ruben Brunk
91c3bc8f3a
am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev
...
* commit '9f6d39f84423d59705c0c7a8746d40cc610caee7':
Add addional scale component for radialDistortion.
2015-06-15 22:58:48 +00:00
Ruben Brunk
9f6d39f844
Merge "Add addional scale component for radialDistortion." into mnc-dev
2015-06-15 22:34:20 +00:00
Ruben Brunk
02cd8cbc9d
Add addional scale component for radialDistortion.
...
Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
2015-06-15 15:33:09 -07:00
George Mount
cf66572471
am 727a6cf6: Fix blink in Explode transition.
...
* commit '727a6cf6ad06bbb43c0c309c33776394a0012895':
Fix blink in Explode transition.
2015-06-15 21:22:58 +00:00
George Mount
727a6cf6ad
Fix blink in Explode transition.
...
Bug 21785708
Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc
2015-06-15 14:12:26 -07:00
George Mount
ce5b433cf4
am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev
...
* commit '8af7848355ef3d8f6042bde1454a478456f6b7fe':
Limit shared element transition to shared elements and children.
2015-06-15 19:55:38 +00:00
Vladislav Kaznacheev
6f20f8bd0a
am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev
...
* commit '0021d3fa13f6e3b4574f857623136a474ee033ec':
Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-06-15 19:55:34 +00:00
George Mount
8af7848355
Merge "Limit shared element transition to shared elements and children." into mnc-dev
2015-06-15 19:43:57 +00:00
Vladislav Kaznacheev
0021d3fa13
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev
2015-06-15 19:43:13 +00:00
Adam Powell
52a20b7d70
am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev
...
* commit '417018f21b85426eb787a462377d83feadc816e9':
Only read foreground attr for FrameLayouts for targetSdkVersion < M
2015-06-15 19:37:12 +00:00
Dianne Hackborn
f3a80c769a
am 285cb414: Merge "Fix issue #21813831 : Need API for asking to be added to power whitelist" into mnc-dev
...
* commit '285cb414eaab8543f6c857357849bfcf24b5974f':
Fix issue #21813831 : Need API for asking to be added to power whitelist
2015-06-15 19:28:53 +00:00
Adam Powell
417018f21b
Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev
2015-06-15 19:25:21 +00:00
Dianne Hackborn
285cb414ea
Merge "Fix issue #21813831 : Need API for asking to be added to power whitelist" into mnc-dev
2015-06-15 19:12:17 +00:00
Dianne Hackborn
1958e5e787
Fix issue #21813831 : Need API for asking to be added to power whitelist
...
Add the API. Clean up a few related things.
Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
2015-06-15 11:53:59 -07:00
Alan Viverette
e53739a311
am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev
...
* commit '2d4dc8db64d0f75e530451acb2c0bea97b9264ff':
Obtain handler from context in CaptioningManager
2015-06-15 18:16:28 +00:00
Alan Viverette
2d4dc8db64
Merge "Obtain handler from context in CaptioningManager" into mnc-dev
2015-06-15 18:05:11 +00:00
Vladislav Kaznacheev
78f146f420
Revert "Make VPA.setInterpolator(null) unset the interpolator."
...
This reverts commit 8cebf3a098 .
Bug: 21804709
Change-Id: I4b3c2c4721b8e7dd5cb38c806bdd078344b09799
2015-06-15 06:58:59 +00:00
Svetoslav
f13e9a7932
am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
...
* commit '6d9778328a3c3c9da525870fff606af8ac5e9529':
Remove bookmarks provider and associated permissions - framework
2015-06-14 20:11:57 +00:00
Svetoslav
6d9778328a
Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
2015-06-14 20:01:02 +00:00
Svet Ganov
1311933408
am 715cf2ac: Make AppOpsManager#permissionToOp API public
...
* commit '715cf2ac0bcd44720096cc91709b690b4828f0df':
Make AppOpsManager#permissionToOp API public
2015-06-14 01:25:43 +00:00
Svet Ganov
715cf2ac0b
Make AppOpsManager#permissionToOp API public
...
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.
bug:21277214
Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
2015-06-14 00:50:38 +00:00
Jim Miller
dd23ad82f3
am 1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev
...
* commit '1035833fc6bcbd970807720926d8b93957775dbe':
Improve LockPatternView accessibility
2015-06-13 01:16:54 +00:00
Jim Miller
1035833fc6
Merge "Improve LockPatternView accessibility" into mnc-dev
2015-06-13 01:10:21 +00:00
Makoto Onuki
6a8cc98fa4
am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
...
* commit 'bd25b5f6021295932a8ce2a6fa534dc37dacf249':
Fix ArrayIndexOutOfBoundsException in Transport.query
2015-06-13 00:35:54 +00:00
Makoto Onuki
bd25b5f602
Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
2015-06-13 00:28:20 +00:00
Makoto Onuki
34bdcdb105
Fix ArrayIndexOutOfBoundsException in Transport.query
...
The bug was that it used getCount() instead of getColumnCount().
Bug 21727804
Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
2015-06-12 17:16:23 -07:00
Makoto Onuki
e35e46acd6
am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
...
* commit '80b34d7b9da0e0738a4a1db78d83cd804372594b':
Add StorageEventListener.onDiskDestroyed()
2015-06-13 00:05:03 +00:00
Makoto Onuki
80b34d7b9d
Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
2015-06-12 23:56:10 +00:00
Ruben Brunk
43918a1348
am 8491d2de: Merge "Fix rounding width." into mnc-dev
...
* commit '8491d2dea90bf462b09befb604138a77d746f94a':
Fix rounding width.
2015-06-12 23:45:27 +00:00
Ruben Brunk
8491d2dea9
Merge "Fix rounding width." into mnc-dev
2015-06-12 23:34:51 +00:00
Adam Lesinski
ea60230592
am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
...
* commit 'cd9d7b7b076ff28bef5403b97754ae2853db17ee':
App Standby: Convert constants to Settings.Global
2015-06-12 23:31:35 +00:00
Jeff Sharkey
f39c53f220
am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev
...
* commit '1d04e6a6cd06062483e22b387c6c1a615e4e5088':
More useful extras in disk/volume broadcasts.
2015-06-12 23:31:30 +00:00
Adam Lesinski
a32f9f7847
am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev
...
* commit '87a79c394dcecd28c3811615ce975abcde185255':
BatteryStatsHelper: Fix some lost power
2015-06-12 23:31:25 +00:00
Adam Lesinski
cd9d7b7b07
Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
2015-06-12 23:20:28 +00:00
Jeff Sharkey
1d04e6a6cd
Merge "More useful extras in disk/volume broadcasts." into mnc-dev
2015-06-12 23:19:34 +00:00
Adam Lesinski
a6232df053
App Standby: Convert constants to Settings.Global
...
Use settings instead of hardcoded constants, and listen for their changes.
Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
2015-06-12 16:19:07 -07:00
Adam Lesinski
87a79c394d
Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev
2015-06-12 23:17:47 +00:00
Jeff Sharkey
c7acac6798
More useful extras in disk/volume broadcasts.
...
Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
2015-06-12 16:16:56 -07:00
Ruben Brunk
68e4fc8ca9
Fix rounding width.
...
Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
2015-06-12 16:16:42 -07:00
Adam Lesinski
57123001a4
BatteryStatsHelper: Fix some lost power
...
Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.
Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.
Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
2015-06-12 16:12:07 -07:00
Makoto Onuki
9dc575d63c
Add StorageEventListener.onDiskDestroyed()
...
Bug 21336042
Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
2015-06-12 16:11:46 -07:00
Ruben Brunk
531106c7a8
am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev
...
* commit 'e36829ee00d178846cb95bebde41cc9204edcd76':
Fix legacy disconnect callback.
2015-06-12 22:32:59 +00:00
Ruben Brunk
e36829ee00
Merge "Fix legacy disconnect callback." into mnc-dev
2015-06-12 22:21:54 +00:00
Adam Powell
bbd3eeb9e5
Only read foreground attr for FrameLayouts for targetSdkVersion < M
...
Now that the android:foreground attribute is supported for all views
it turns out some existing apps were previously setting foreground or
applying styles with a foreground to unsupporting views even though
the values being set were not drawables. While this was silently
ignored before, now it results in app crashes.
The most expedient fix is to only support foreground on
non-FrameLayout views if the app sets targetSdkVersion to M or newer.
Bug 21646309
Change-Id: I8937f44988866e86e640555f4bbc5dd5b2e1cce1
2015-06-12 14:54:49 -07:00
Ruben Brunk
b44864e76b
Fix legacy disconnect callback.
...
Bug: 21708377
Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
2015-06-12 14:39:12 -07:00
Doris Liu
0fbd61ec26
am 0b9fd85f: Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev
...
* commit '0b9fd85f8f08fb0fc19af75a386d14e103745561':
Change ActionBar animtion from/to ActionMode
2015-06-12 21:38:57 +00:00
Doris Liu
0b9fd85f8f
Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev
2015-06-12 21:31:48 +00:00
Doris Liu
94283533ab
Change ActionBar animtion from/to ActionMode
...
This CL changes the animation going from/to ActionMode per UX request.
The previous animation uses a combination of scale and translation
animation, whereas the new animation uses fade-out and then fade-in
(no cross-fade) for the action bar transition.
Bug: 20882034
Change-Id: I06286a215d058ed6f9f2023a4f0bcc60fa7ef46f
2015-06-12 14:21:30 -07:00
Dianne Hackborn
0016225663
am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
...
* commit 'e554cc96597d4b738f14a1514772e4d49e78c542':
Implement some control over ALLOW_WHILE_IDLE alarms.
2015-06-12 19:40:26 +00:00
Chris Wren
6d7bd14a7e
am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
...
* commit '17de4b2a73996366ff3d7759793a6809654caebe':
remove usage of deprecated method setLatestEventInfo
2015-06-12 19:40:13 +00:00