George Mount
c191226323
am 76a1df69: am 8383fba1: am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev
...
* commit '76a1df698b0005f8b85e81bdae159e1647e9c8c5':
Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
2014-09-02 07:11:02 +00:00
Dianne Hackborn
9ab7f26183
am abb2e104: am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev
...
* commit 'abb2e104319552d2fd98d94fbd089f9ebdbbfe2d':
Oh sticky broadcasts, I'd like to do even worse to you.
2014-09-02 07:10:51 +00:00
John Spurlock
4494da981b
am 22c0f356: am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev
...
* commit '22c0f356f8793d44f9613cd5224d771e0c419442':
Add a hidden system method to check call filter.
2014-09-02 07:10:46 +00:00
Amith Yamasani
af039dfa78
am 4c1054a8: am b9970b0f: am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev
...
* commit '4c1054a81b22843dcd36497347dd4ce637b24022':
Clean up apks installed for a removed user
2014-09-02 07:10:36 +00:00
Michael Wright
e4717e4378
am 467e25f1: am a4e2b977: am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev
...
* commit '467e25f1ae0164012793bde9475e7b2be1a0472f':
Use a linear spline if there's a non-monotonic brightness curve
2014-09-02 07:10:26 +00:00
Chris Wren
d6c6cd80f0
am 7c528397: am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev
...
* commit '7c528397b54ca5b6cb865e7ba37754f3a831830c':
Disable lockscreen notifications for secure users on upgrade.
2014-09-02 07:09:56 +00:00
Christoph Studer
3ccf29ebf0
am 31942966: am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev
...
* commit '31942966028cbf9b669e27a8e720350b0af1268a':
NoMan: Allow listeners to specify notification trim
2014-09-01 11:25:43 +00:00
Adam Lesinski
a5b221254e
am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev
...
* commit '0d7dd79b8acb2ad37c004d73de4a8c8455b38427':
Make UsageStats API comply with API Council
2014-09-01 11:25:17 +00:00
Adam Lesinski
4c38b8a7e7
am e4dce761: am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
...
* commit 'e4dce761a149113d6ecfa4cb2cee299926c54eac':
Revert "Make UsageStats API comply with API Council"
2014-09-01 11:25:03 +00:00
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
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
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
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
Adam Lesinski
5119ea7e35
am 43186e07: am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev
...
* commit '43186e0784ff597be49d272d43bd7d3767f9e935':
Make UsageStats API comply with API Council
2014-08-29 21:07:20 +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
Yin-Chia Yeh
4ec4f8f009
am 3c505dae: am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev
...
* commit '3c505dae125b34483b9173401cb2fe84c86e2485':
Camera2: Remove spurious warnings
2014-08-29 20:33:43 +00:00
Igor Murashkin
c57a88c631
am b99ecc40: am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev
...
* commit 'b99ecc40ee77f14ca46e8eaf3484bfc8e3721233':
camera2: Implement TotalCaptureResult#getPartialResults
2014-08-29 20:33:38 +00:00
John Reck
f8d104eed8
am 05b4e21e: am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev
...
* commit '05b4e21ecda890ca20381384a772b4f7d66157a5':
Listener callbacks ordering fixups
2014-08-29 20:33:33 +00: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
Lorenzo Colitti
99dbe39234
am 96ec882b: am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev
...
* commit '96ec882ba17f542b42b1da453325b8dba9ce67f2':
Really remove NetworkBoundURLFactory.
2014-08-29 19:15:49 +00:00
Jorim Jaggi
ff44e803ad
am 8219f7cc: am 2157b125: am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev
...
* commit '8219f7cc7e2fd3e623d8e14260ab720197952c3b':
Fix various problems with notification layouts
2014-08-29 19:15:22 +00:00
Jeff Sharkey
2c653e1a53
am a841cead: am bb50b0b4: am f1ddfd1e: Keep tests building.
...
* commit 'a841ceadd9940b8349e49e35693e31918977f29e':
Keep tests building.
2014-08-29 19:14:51 +00:00
Jeff Sharkey
9928f2b62a
am f751f4d6: am fc5b41eb: am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
...
* commit 'f751f4d60cc8dae6741f826ec2d959a01fc51f82':
FileBridge needs to keep strong reference to PFD.
2014-08-29 19:14:43 +00:00
Sandeep Siddhartha
7f31f82432
am 601d017c: am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev
...
* commit '601d017c2209f0a7930503a0bc97b4e762e4e8a1':
Address API review comments
2014-08-29 19:14:33 +00:00
Terry Heo
e5e1d6da5f
am 1f0736a0: am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
...
* commit '1f0736a064e2911a5ad76f49d32cda88fb4f53f4':
CEC: Implement dump() of HdmiControlService
2014-08-29 19:14:23 +00:00
Adam Powell
3367283946
am 7f729bf6: am 41d34328: am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev
...
* commit '7f729bf64fa345afbb16e762dfe916ecd94015ce':
Doc improvements for new Toolbar changes, now with attributes.
2014-08-29 19:14:18 +00:00
Adam Powell
8f8cfdb921
am df186cea: am 1ae3bf17: am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev
...
* commit 'df186cea1a71928839efe2b56b01ecdfdbfdbd4f':
Don't add title margins during to Toolbar layout if titles don't fit
2014-08-29 19:14:12 +00:00
Adam Powell
0372031382
am 7faa69ce: am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev
...
* commit '7faa69ced32f3f3ce0f8ec3143f6d90d24b0dfc3':
Add xml attributes to Toolbar for navigation icon
2014-08-29 19:14:06 +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