Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,883 Commits 3 Branches 0 Tags
01fd39a09d1a0b451b56cdd897cf4db51441c41f
Commit Graph

43666 Commits

Author SHA1 Message Date
Michael Wright
01fd39a09d am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit '6e0bd93a2b7fc338c3ba64995cba309cd51035b6':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:21:50 +00:00
Jean-Michel Trivi
8adc5b68ad am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit '26f51de01c45e86c340efd783ea577719850be4a':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:21:45 +00:00
Tyler Gunn
c855fa5991 am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit 'a8c7d1bcf5de323a8a5b8e3fff0c7759be06118e':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 18:00:00 +00:00
Dianne Hackborn
86f0c17e4b am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '4e784a505cb76e00e88dcf00c7b41b6ff0417964':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 17:59:55 +00:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7 Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 2014-09-02 17:52:46 +00:00
Ronghua Wu
ea34edbee6 am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit 'eaa9befb1e981d58a8e4d248c88d4fe204d06ea9':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 17:43:10 +00:00
Amith Yamasani
4f34c86f3c am e681727f: am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev 
* commit 'e681727f0106b67824e6315e5473232b42f54120':
  Make it possible to remove current user
 2014-09-02 17:42:54 +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
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
94d23608eb am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit '8e95e5f75073aa7a43fba25ae9fc257ddc6159e6':
  Update window always on convertTo/FromTranslucent
 2014-09-02 16:38:18 +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
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback 
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
 2014-09-01 23:49:57 -07:00
Adrian Roos
e647a9a5fe am 0910b0b7: am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 
* commit '0910b0b7229db8a826b8fc9d3a57a4dc40ded1c8':
  Trust: Look at the security unlock method of the right user
 2014-09-01 21:37:24 +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
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
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
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
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
Jean-Michel Trivi
c5258433dd Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager 
For ACTION_HEADSET_PLUG (already in SDK):
 - duplicated definition in AudioManager and moved
  javadoc there. Javadoc in Intent points to AudioManager.
 - the String value is not changed

For ACTION_HDMI_AUDIO_PLUG (being added in SDK):
 - moved defintion from Intent to AudioManager
 - updated String value to reflect package name "android.media"
  instead of using "android.intent"
 - added definition of the extras, but removed "name".

For ACTION_ANALOG_AUDIO_DOCK_PLUG,
    ACTION_DIGITAL_AUDIO_DOCK_PLUG,
    ACTION_USB_AUDIO_ACCESSORY_PLUG,
    ACTION_USB_AUDIO_DEVICE_PLUG, all hidden:
 - moved definition from Intent to AudioManager,
 - changed the value from "android.intent.*" to "android.media.*"

Updated AudioService, UsbDeviceManager and UsbHostManager
 to refer to the actions in AudioManager, not Intent.

Bug 17289385

Change-Id: I61dd73140022d2bb9a676a57f595092c8fa89dcc
 2014-08-29 17:29:27 -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
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