Commit Graph

43325 Commits

Author SHA1 Message Date
Tyler Gunn
bd4ca2b4b4 am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
* commit '78c0d4ab75c61efc48af1a698fd7d36620523866':
  Remove "ask each time" SIP call setting. (1/2)
2014-09-02 17:42:11 +00:00
Dianne Hackborn
8bce896373 am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
* commit '4b9a934cef4de4985c0e316ef89ca41b3e720135':
  Hide the interaction part of VoiceInteractionService.
2014-09-02 17:42:08 +00:00
Tyler Gunn
4b7498d81f Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 2014-09-02 17:31:39 +00:00
Ronghua Wu
4f932886aa am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
* commit 'e4999af808ac0e48932e3ac843df9bb9e6a45c46':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
2014-09-02 17:31:11 +00:00
Amith Yamasani
f1541722e4 am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
* commit '9bdf3963a64d8eb0b66705da3922c464badaa539':
  Make it possible to remove current user
2014-09-02 17:31:04 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
2014-09-02 10:29:28 -07:00
Ronghua Wu
a7118c9bb2 Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 2014-09-02 17:27:26 +00:00
Amith Yamasani
2cdcc7d360 Merge "Make it possible to remove current user" into lmp-dev 2014-09-02 17:21:58 +00:00
George Mount
226cc30fbb am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
* commit '8fd72d49213971e8a2ef84831c0035692a877870':
  Update window always on convertTo/FromTranslucent
2014-09-02 16:25:16 +00:00
George Mount
b4558e7e5f Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 2014-09-02 16:20:06 +00:00
Tyler Gunn
2c830a2905 Remove "ask each time" SIP call setting. (1/2)
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.

Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
2014-09-02 08:39:35 -07:00
Adrian Roos
1db5a8a9ff am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev
* commit '5e28745716363fcfad6d88651846d7c6dc4d4ea3':
  Trust: Look at the security unlock method of the right user
2014-09-01 21:19:12 +00:00
Adrian Roos
ab84dba863 Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 2014-09-01 21:13:12 +00:00
Adrian Roos
1572ee379e Trust: Look at the security unlock method of the right user
Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7.

Bug: 17107213
Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
2014-09-01 23:03:28 +02:00
Christoph Studer
91c2651b1e am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev
* commit '7e1e2109e76d99fefa5ca98180dff098a6eca996':
  Notification: Reset view params for re-use
2014-09-01 19:39: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
1003de7b7e am faecb0b4: Merge "Media notification updates" into lmp-dev
* commit 'faecb0b40a1ac2371d93d245e2a65a22ce4b1f0c':
  Media notification updates
2014-09-01 16:01:26 +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
f935212a9a am 08e56027: Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev
* commit '08e560277327ee4fea86d642948e2195a874344a':
  Get rid of one redundant comparison of #mComposingTextStart
2014-09-01 14:44:11 +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
Wink Saville
05e6dde3a0 ksd to lmp-sprout-dev
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
2014-09-01 05:38:31 +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
3acc8f14cd Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 2014-08-31 22:52:43 +00:00
George Mount
6690e3a167 Merge "Use optimized Keyframes for Path animations." into lmp-dev 2014-08-31 22:17:46 +00:00
Amith Yamasani
1df1473008 Make it possible to remove current user
Due to the async nature of switching users, it's not possible to
switch and remove immediately. So mark the switch target user as
soon as the user switch is requested, so that a remove will proceed
without failing at stopUserLocked().

Also, fix a similar problem with deleting the current guest and
switching to a new guest. It was attempting to remove the current
user which will result in a failed stopping of the user.
Added a way to mark the current guest
for deletion so that a new one can be created, switched to and the
old one deleted. If runtime fails, old guest is already marked for
deletion and will be cleaned up on restart.

Bug: 17321533
Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
2014-08-29 22:06:16 -07: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
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
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
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
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
a496b1a7f3 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 18:56:24 +00:00
Yin-Chia Yeh
3e294e9921 Merge "Camera2: Remove spurious warnings" into lmp-dev 2014-08-29 18:02:50 +00:00