George Mount
ea4da9e19f
am 8383fba1: am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev
...
* commit '8383fba1c61d3b7d2f7cafb85a3c186d4b7eaf27':
Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
2014-08-29 23:54:22 +00:00
Dianne Hackborn
b74989b40c
am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev
...
* commit 'd0780328259c9522e150e790e24226325c2288f7':
Oh sticky broadcasts, I'd like to do even worse to you.
2014-08-29 23:54:12 +00:00
John Spurlock
c9093b30f0
am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev
...
* commit 'ec6c1a68a5a48cb20f7290342f17de85778741db':
Add a hidden system method to check call filter.
2014-08-29 23:54:07 +00:00
Amith Yamasani
5c5d8f8e5a
am b9970b0f: am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev
...
* commit 'b9970b0fbe5f4436490552f52c64331cbec78d3e':
Clean up apks installed for a removed user
2014-08-29 23:53:58 +00:00
Michael Wright
6eb8b59159
am a4e2b977: am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev
...
* commit 'a4e2b9771dc8903a27ea2a73e1b208c87a38c097':
Use a linear spline if there's a non-monotonic brightness curve
2014-08-29 23:53:48 +00:00
Chris Wren
3f420855ae
am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev
...
* commit 'a69ad7a380c246f3665984aad4ce53cf9e025e8c':
Disable lockscreen notifications for secure users on upgrade.
2014-08-29 23:53:05 +00:00
dcashman
efb1f36f09
Merge "Address KeySet API Review" into lmp-dev
2014-08-29 23:06:50 +00:00
George Mount
984011f685
Use optimized Keyframes for Path animations.
...
Bug 17005728
Change-Id: I2e109ed1a3e768e1e0286fc3950516f16509e591
2014-08-29 16:02:28 -07:00
Robin Lee
bccf6f0323
Merge "Keep managed profile keystores in sync with owner" into lmp-dev
2014-08-29 23:01:29 +00:00
George Mount
9a61f9485e
Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev
2014-08-29 22:43:25 +00:00
Dianne Hackborn
e56665cd4e
Merge "Oh sticky broadcasts, I'd like to do even worse to you." into lmp-dev
2014-08-29 22:37:48 +00:00
Dake Gu
872efe45d5
ActivityTransition: fix activity not finished on back
...
Fixed two corner cases that called activity is not finished
on back when there is no shared element in calling activity due
to "Do not keep activity" option re-creates calling activity.
b/17333777
Change-Id: I66567efcce39b301b0febd1ce7a5d67b9ff73c3c
2014-08-29 15:33:20 -07:00
Dianne Hackborn
2c3530061f
Oh sticky broadcasts, I'd like to do even worse to you.
...
Change-Id: I36a7eae294d325d1bd88c15d52566dd4ee1f35be
2014-08-29 15:27:11 -07:00
John Spurlock
bd69378419
Merge "Add a hidden system method to check call filter." into lmp-dev
2014-08-29 22:17:10 +00:00
John Spurlock
2b122f4c2e
Add a hidden system method to check call filter.
...
As a stopgap for dialer, add a NoMan method to check
whether or not contact extras meet the current notification
interruption filter, if phone calls are allowed at all.
Bug:17299986
Change-Id: I4d7e04b974d878504ef4e3a73cb6b602cdd2f73e
2014-08-29 18:09:35 -04:00
Robin Lee
f0246a8a14
Keep managed profile keystores in sync with owner
...
Fixes setting a keyguard password for keystore in a multi-user setup
while we're at it.
Bug: 16233206.
Change-Id: I7941707ca66ac25bd122fd22e5e0f639e7af697e
2014-08-29 23:03:42 +01:00
Amith Yamasani
b48be6e858
Merge "Clean up apks installed for a removed user" into lmp-dev
2014-08-29 21:51:09 +00:00
Michael Wright
c0a6c03cf2
Merge "Use a linear spline if there's a non-monotonic brightness curve" into lmp-dev
2014-08-29 21:43:15 +00:00
Michael Wright
3e9a13438d
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: I8fcee061b18c8ae9cc9a1b38d8b850aaec4478ce
2014-08-29 14:39:12 -07:00
Chris Wren
4775109ec1
Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev
2014-08-29 21:25:43 +00:00
Christoph Studer
50b8fcb1f0
am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev
...
* commit 'e63f3434de0adc3bc9505e954fc3d58b4f627074':
NoMan: Allow listeners to specify notification trim
2014-08-29 21:03:04 +00:00
Chris Wren
cd8f4f71fc
Disable lockscreen notifications for secure users on upgrade.
...
Add a notification for those users that teaches them how to re-enable
the notifications.
Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
2014-08-29 20:49:36 +00:00
Christoph Studer
78358b1788
Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev
2014-08-29 20:37:50 +00:00
George Mount
f31d83ce70
Fix NPE in EnterTransitionCoordinator.
...
Bug 17324730
Change-Id: I2a8c5a4b82a7a252d4ac2319a26f3610b8e358ac
2014-08-29 13:32:20 -07:00
Adam Lesinski
e466091f06
am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev
...
* commit '81d63ef2f2249a3be896a6ca792aeb8e2faf50fb':
Make UsageStats API comply with API Council
2014-08-29 20:18:22 +00:00
Adam Lesinski
d6fe30be04
am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
...
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4':
Revert "Make UsageStats API comply with API Council"
2014-08-29 20:05:14 +00:00
Adam Lesinski
cc562a811d
Make UsageStats API comply with API Council
...
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap
Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
2014-08-29 12:52:41 -07:00
Adam Lesinski
25b09837d1
Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40
Revert "Make UsageStats API comply with API Council"
...
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.
Did not update current.txt
Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
2014-08-29 19:34:09 +00:00
Adam Lesinski
d57e1cb644
am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev
...
* commit 'f5e3785e6fc2d4dcbc8ce72ad871a96421ca1f1d':
Make UsageStats API comply with API Council
2014-08-29 19:21:28 +00:00
Yin-Chia Yeh
fc90ddcf92
am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev
...
* commit 'b3ff5477cd4d72631551bac81c543ed74179eda3':
Camera2: Remove spurious warnings
2014-08-29 19:07:02 +00:00
Igor Murashkin
80bcba6413
am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev
...
* commit 'e24c71fd133ba2564e84b4d171689a48f37c070a':
camera2: Implement TotalCaptureResult#getPartialResults
2014-08-29 19:06:57 +00:00
John Reck
b46c52209f
am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev
...
* commit '724fff2034e17c601a3787792f8fb73172862c18':
Listener callbacks ordering fixups
2014-08-29 19:06:53 +00:00
Adam Lesinski
a496b1a7f3
Merge "Make UsageStats API comply with API Council" into lmp-dev
2014-08-29 18:56:24 +00:00
Lorenzo Colitti
f97b6bfb21
am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev
...
* commit '64e6f01ff36bdfd6ba58436c35701d68ad174790':
Really remove NetworkBoundURLFactory.
2014-08-29 18:52:37 +00:00
Jorim Jaggi
2c71e55706
am 2157b125: am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev
...
* commit '2157b125c0071f27500ae0e69bd21588027c0b3b':
Fix various problems with notification layouts
2014-08-29 18:51:04 +00:00
Yohei Yukawa
4bf61aa61e
am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev
...
* commit '7046f79ec9c9b0510af0f541f0e135b8a1ad4f5d':
Reject request when any unknown flag is speficied
2014-08-29 18:50:18 +00:00
Jeff Sharkey
01e7bc6e6c
am bb50b0b4: am f1ddfd1e: Keep tests building.
...
* commit 'bb50b0b4f3f7b738317cf905c7ef6274e89828c7':
Keep tests building.
2014-08-29 18:50:08 +00:00
Jeff Sharkey
670feb4a76
am fc5b41eb: am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
...
* commit 'fc5b41eb8ef68686f49ed2b455fa25928e86a3f6':
FileBridge needs to keep strong reference to PFD.
2014-08-29 18:49:57 +00:00
Sandeep Siddhartha
80e8b901b3
am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev
...
* commit 'efe6c9032d1a1463aeda62e034c7fe42db5866e9':
Address API review comments
2014-08-29 18:49:40 +00:00
Terry Heo
2966c8689d
am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
...
* commit 'b2357d5aabf85fa1b36036024e53da7dab416815':
CEC: Implement dump() of HdmiControlService
2014-08-29 18:49:09 +00:00
Adam Powell
3db557537a
am 41d34328: am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev
...
* commit '41d34328b8b85d67a754687bd4e7570cdd4e8846':
Doc improvements for new Toolbar changes, now with attributes.
2014-08-29 18:48:52 +00:00
Adam Powell
60aa53f71b
am 1ae3bf17: am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev
...
* commit '1ae3bf177d3ad86071ed7183511ef05ee57c6dcf':
Don't add title margins during to Toolbar layout if titles don't fit
2014-08-29 18:48:44 +00:00
Adam Powell
06086bc31e
am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev
...
* commit '32e9145c929ba740e3fce91cc495a97a538a9c37':
Add xml attributes to Toolbar for navigation icon
2014-08-29 18:48:38 +00:00
Yin-Chia Yeh
3e294e9921
Merge "Camera2: Remove spurious warnings" into lmp-dev
2014-08-29 18:02:50 +00:00
Igor Murashkin
0d1227d8b9
Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev
2014-08-29 18:00:39 +00:00
John Reck
7da70ed6a5
Merge "Listener callbacks ordering fixups" into lmp-dev
2014-08-29 17:59:24 +00:00
John Reck
4d2c47206a
Listener callbacks ordering fixups
...
Bug: 17228458
Bug: 17317816
Ensure that onStart is called prior to onCancel/onFinished if those
happen prior to the UI-thread handled start delay.
Ensure that onFinished is called if cancel/end is called
Change-Id: I23c16ea1c4f925d59d41ec5281d62dfc0c38595b
2014-08-29 10:40:56 -07:00
Yin-Chia Yeh
d47699a47a
Camera2: Remove spurious warnings
...
It is valid if all compenents of a synthetic key are null.
Don't warn in that case.
Bug: 17300101
Change-Id: Ifacf2fb56d1272b33a2b1ae377a85c9011e22b24
2014-08-29 17:39:30 +00:00
Amith Yamasani
dda003ffa8
Clean up apks installed for a removed user
...
When a user is removed, enumerate through all installed packages
to see if any of them are not installed for any user. Delete the
package if no user has it "installed".
Added a pm option to install an apk for a specific user.
Fixed a crash in UserManagerService when executing the above
cleanup - dying users generate a null UserInfo.
Bug: 15426024
Change-Id: I571decde1ae1c257d0da6db153b896aad6d6bcb4
2014-08-29 10:28:38 -07:00