Christoph Studer
5da33dd794
am 496e72ca: am b95181ac: am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev
...
* commit '496e72cac5103edd1ccd56a95741ec664fe9cae3':
Notification: Reset view params for re-use
2014-09-02 17:39:24 +00:00
Jorim Jaggi
db1600aeec
am c2ce51ee: am db68bb49: am faecb0b4: Merge "Media notification updates" into lmp-dev
...
* commit 'c2ce51eea33d81728420724bb6bd7bdd0f85c63a':
Media notification updates
2014-09-02 17:38:53 +00:00
Yohei Yukawa
cc5c2e110b
am 4a4a566f: am ee4f6579: am 08e56027: Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev
...
* commit '4a4a566f0d9f81cb9341da19a00839ce5ff728a9':
Get rid of one redundant comparison of #mComposingTextStart
2014-09-02 17:38:33 +00:00
George Mount
6c07bacd64
am 571f1373: am ae570491: am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev
...
* commit '571f1373244f2ca21345744a5029154ec536fc9d':
Fix NPE in EnterTransitionCoordinator.
2014-09-02 17:34:47 +00:00
George Mount
fe6acd9606
am 00b92bc9: am f055be2d: am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev
...
* commit '00b92bc94c1319a0e2e7ee484fb64d68dbfab3fa':
Use optimized Keyframes for Path animations.
2014-09-02 17:34:42 +00:00
Ruben Brunk
fd3c235720
am 67b7f03c: am 25e44765: am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
...
* commit '67b7f03ca315ef4666c7db5ef9bb72031b7ffac8':
camera2: Add HDR vendor tag for legacy mode.
2014-09-02 17:33:28 +00:00
dcashman
a3fc37688e
am 81e03816: am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev
...
* commit '81e038162935b00ccb2f6c76be4c3f633a8a1cb5':
Address KeySet API Review
2014-09-02 07:11:27 +00:00
Robin Lee
4121ec6aa1
am 714e80be: am 066b8593: am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev
...
* commit '714e80be6a51c0156cd63ef6abd347f33b6cc161':
Keep managed profile keystores in sync with owner
2014-09-02 07:11:22 +00:00
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
d7263993e4
am b95181ac: am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev
...
* commit 'b95181ac8db47d735f50cb0be04cf2330756ecf5':
Notification: Reset view params for re-use
2014-09-01 19:51:33 +00:00
Christoph Studer
9c70889274
Merge "Notification: Reset view params for re-use" into lmp-dev
2014-09-01 19:26:56 +00:00
Christoph Studer
fe718433e0
Notification: Reset view params for re-use
...
Since RemoteViews are reapplied in SysUI, reset potentially
modified view params before configuring it.
Bug: 17175860
Change-Id: I0eceb1522461f8302e69af1a995a8d036951d1ed
2014-09-01 21:01:21 +02:00
Jorim Jaggi
a44cedee59
am db68bb49: am faecb0b4: Merge "Media notification updates" into lmp-dev
...
* commit 'db68bb49ab069f6044ad806a845b6914905c230f':
Media notification updates
2014-09-01 16:13:52 +00:00
Jorim Jaggi
dfa4037e88
Merge "Media notification updates" into lmp-dev
2014-09-01 15:52:02 +00:00
Jorim Jaggi
17ee3ec0b8
Media notification updates
...
- Make text white.
- Adjust padding & metrics to redlines.
- Use different narrow layout when 3 or less notifications with big
picture.
- Update action ripples.
- Fix progress bar size & fix color for indeterminate progress bar.
- Apply default background in SystemUI when no color is set, so we
don't end up with white text on white background.
Bug: 15437369
Bug: 16625746
Bug: 15147533
Change-Id: Ie8bd5ad0bbca972685adb50034fff88ea97456bd
2014-09-01 17:26:51 +02:00
Yohei Yukawa
525396fd2a
am ee4f6579: am 08e56027: Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev
...
* commit 'ee4f6579d31496f7add470a9c871f97271b9de46':
Get rid of one redundant comparison of #mComposingTextStart
2014-09-01 14:56:26 +00:00
Yohei Yukawa
9477891f23
Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev
2014-09-01 14:31: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
Yohei Yukawa
e05d4ca4dc
Get rid of one redundant comparison of #mComposingTextStart
...
The code in question is not only redundant but also
harmful because it causes unnecessary integer boxing.
BUG: 17340578
Change-Id: Ife6e48889db80394d224297c53806105dc41d56e
2014-08-31 18:29:37 -07:00
George Mount
4b310aa515
am ae570491: am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev
...
* commit 'ae5704917b9c7031d78c39c54bce962dbc5dad10':
Fix NPE in EnterTransitionCoordinator.
2014-08-31 23:14:32 +00:00
George Mount
3acc8f14cd
Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev
2014-08-31 22:52:43 +00:00
George Mount
0813a94c7b
am f055be2d: am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev
...
* commit 'f055be2d46e2a42920b3cffe9af2a645560e926d':
Use optimized Keyframes for Path animations.
2014-08-31 22:40:19 +00:00
George Mount
6690e3a167
Merge "Use optimized Keyframes for Path animations." into lmp-dev
2014-08-31 22:17:46 +00:00
Ruben Brunk
af496e7ba0
am 25e44765: am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
...
* commit '25e4476596079bc603b0822d6255d31119380a3f':
camera2: Add HDR vendor tag for legacy mode.
2014-08-30 00:44:48 +00:00
Ruben Brunk
6293217929
Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
2014-08-30 00:27:43 +00:00
dcashman
a289ea1f1b
am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev
...
* commit 'e71234b3410519d2d0ab91775378e594f74a73bb':
Address KeySet API Review
2014-08-29 23:54:49 +00:00
Robin Lee
aacc124d6e
am 066b8593: am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev
...
* commit '066b85934baad993d4040723192ed07846d3af71':
Keep managed profile keystores in sync with owner
2014-08-29 23:54:44 +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
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
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