138858 Commits

Author SHA1 Message Date
Eino-Ville Talvala
73b1d94baf Merge "Camera2: Many docs updates" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Robert Greenwalt
99d4dd278e Merge "Apply API review to android.net.Network:" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Paul Jensen
0a363a319f Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit 5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)
2014-06-10 22:26:11 +00:00
Robert Greenwalt
78802575ac Merge "Add a new IpPrefix class and use it in RouteInfo." 2014-06-10 22:12:51 +00:00
Selim Gurun
1ac3e017d4 Merge "Add WebChromeClient.showFileChooser" 2014-06-10 22:13:32 +00:00
Deepanshu Gupta
096e639d3d Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Deepanshu Gupta
b54b78e215 LayoutLib: Support more ContextThemeWrappers
ContextThemeWrapper may be the base context for another
ContextThemeWrapper. We now extract the base context till we reach the
final context.

Change-Id: I034444a2d1579241543fd24248530b299e72498a
2014-06-10 17:44:37 -07:00
Matthew Williams
95981dc8ad Merge "Fix battery controller non-fire bug" into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Matthew Williams
759275d9da Fix battery controller non-fire bug
Receiver wasn't registered to listen for the action coming
back from the Alarm Manager.
Also, if a task starts being tracked by the battery controller
and the device is on power, the batt. controller will notify
the scheduler as such.
Added dumpsys for battery controller to help debugging.
Change-Id: I7ce305b816aea69e8d05a3daf23124c163546788
2014-06-10 16:13:06 -07:00
Winson Chung
6f6f273df6 Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev 2014-06-10 22:00:10 +00:00
Christopher Tate
488662c570 Merge "Fix build" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Christopher Tate
b7b70f0f99 Fix build
Change-Id: I339f7f1ab82af699ee34c3baf824d0278477a4cf
2014-06-10 15:20:49 -07:00
Selim Cinek
1c9c717f1b am f1187ac8: Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev
* commit 'f1187ac8e8d2c8927caf322a12de8c32ee3f919f':
  Added card elevation when card is clicked on the lockscreen
2014-06-10 21:41:46 +00:00
John Spurlock
edbfd04060 Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
6d20526adf Brightness slider no longer displays the automatic icon.
Bug:15414855
Change-Id: I3a1b8e7758e41abd172c20177f42452077bfc7a7
2014-06-10 19:28:03 -04:00
Julia Reynolds
1b8aef2be7 Merge "Material-ize the restrictions pin challenge." 2014-06-10 21:32:31 +00:00
Adrian Roos
e74b853d9f resolved conflict for merge of 3ca33b70 to master
Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
2014-06-11 15:02:55 +02:00
Jorim Jaggi
e6cad8027c am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev
* commit '5eb62efd935399335ee2504a483900c69a45494a':
  Do not override mColor with default color if none set
2014-06-11 12:41:45 +00:00
Sreeram Ramachandran
cc91c7b804 Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00
Calin Juravle
16719591f4 Merge "Shrink profiler.start-immediately to fit in the maximum property size" 2014-06-10 21:26:11 +00:00
Calin Juravle
994cd28e72 Shrink profiler.start-immediately to fit in the maximum property size
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
2014-06-11 18:21:41 +01:00
Jose Lima
583b6f782c Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev 2014-06-10 21:25:11 +00:00
John Spurlock
6ab89e28cd Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 2014-06-10 21:22:41 +00:00
Jorim Jaggi
ce3d6c4c02 Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev 2014-06-10 21:21:32 +00:00
Adrian Roos
2643de55d3 Merge "Update security method after switching user" 2014-06-10 21:21:32 +00:00
Jorim Jaggi
a5c1506313 am dc61882e: Merge "Fix black background for auto-redacted legacy notifications" into lmp-preview-dev
* commit 'dc61882ef03a25f7861aff838577ef124a8f40e7':
  Fix black background for auto-redacted legacy notifications
2014-06-11 11:25:07 +00:00
Adrian Roos
1ab15ca80b am c77c504e: Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev
* commit 'c77c504ed7a155a80291f8b54c8e3db6f5303d30':
  Fix broken tablet layout of QS on lockscreen
2014-06-11 11:25:00 +00:00
Doug Zongker
f27c27c20c am 68adbeb1: (-s ours) Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev
* commit '68adbeb1348501dfd7677bf6c04e317127f5f851':
  hide RECOVERY permission from L preview -- DO NOT MERGE
2014-06-11 11:24:54 +00:00
Selim Cinek
1352ef562f am 02f94e07: Merge "Fixed several bugs with redaction." into lmp-preview-dev
* commit '02f94e073838c4b58b01d4dbba7b8f60ce01b49c':
  Fixed several bugs with redaction.
2014-06-11 11:24:49 +00:00
Selim Cinek
9e5ed535a4 am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev
* commit '0f700f8c65979609242d3a18db412a0ce561eccb':
  Fixed an issue where holes in the notification shade could appear.
2014-06-11 11:24:44 +00:00
Nicolas Prevot
0cc9c1e9d3 Merge "Changing the value of the user consent extra in DevicePolicyManager." 2014-06-10 21:31:35 +00:00
Jessica Hummel
fe1de89fe9 am 3d5066de: Merge "Add different resolutions of afw icons" into lmp-preview-dev
* commit '3d5066de154193cc3a08a7be168aa5e31bfe0359':
  Add different resolutions of afw icons
2014-06-11 09:55:17 +00:00
Jessica Hummel
9c9fc7e536 am f65d5b41: Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
* commit 'f65d5b41bb382a93be752076a2c0d8bd8a2cb012':
  Updating the pictures and labels for cross-profile intents.
2014-06-11 09:55:11 +00:00
Selim Cinek
45f904a529 resolved conflicts for merge of b38fd3d4 to master
Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e
2014-06-11 11:45:24 +02:00
Jinsuk Kim
7207b792d9 Merge "Define SendKeyAction for HdmiControlService" 2014-06-10 22:31:57 +00:00
Jinsuk Kim
cd97baf4d0 Define SendKeyAction for HdmiControlService
SendKeyAction is one of FeatureAction classes that handles HDMI-CEC UCP/UCP
(User Control Pressed/Release) command transmission flow mechanism.

Change-Id: Iede8479103330c1f9db516218c6a94d09ef6b7f4
2014-06-11 14:30:32 +09:00
Jungshik Jang
5945d484ca Merge "Use cached message in NewDeviceAction." 2014-06-10 22:31:57 +00:00
Jungshik Jang
a466929979 Use cached message in NewDeviceAction.
Vendor id and osd name can be cached in be reused
later.
Along with this, fix a bug on HotplugDetectionAction.

Change-Id: I0583a9c266eed4281a99a59b1301f41b3e155505
2014-06-11 13:59:59 +09:00
Jungshik Jang
65c64c31ab Implements Hdmi Cec keycode translater
In order to transfer some keyevent to other device
we need to have a logic to translate Android keycode
to Hdmi CEC keycode and vice versa.
HdmiCecKeyTranslater handles bidirectional keycode translation.
Basically it assumes bijection between android key code to
a pair of cec keycode and its optional param.
KeycodeEntry of HdmiCecKeycodeTranslate handles a mapping of it.

Note that all available mappings have no parameterized mapping.
If new Android keycode is defined for parameterized cec keycode,
entry should be added.

Change-Id: I287082a0a6ef5eb6f0916044b78179fe3fdfbece
2014-06-11 10:14:39 +09:00
Yohei Yukawa
04fcf1cabe Merge "Show IME-related system IME dialogs over windows owned by the IME" 2014-06-10 22:29:12 +00:00
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +00:00
Lorenzo Colitti
7dc78cf3af Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
2014-06-10 14:46:39 -07:00
Calin Juravle
2f84b69bf5 Merge "Improved profile.start-immediately comment" 2014-06-10 21:16:15 +00:00
Jonathan Dixon
3a5cf3876c Add WebChromeClient.showFileChooser
Bug: 6930981

This replaces the never-published openFileChooser, and is more future
extensible.
Currently hidden; will unhide once working end to end and tested.

Change-Id: Ie66750be37e5b90e4a411cec76278369dc8dabe8
2014-06-10 13:58:07 -07:00
Jose Lima
5517ea78eb Make convertToTranslucent a public method in Activity
- Changed the access level for convertToTranslucent in Activity
   to public.
   - Still keeping convertToTranslucent as a hidden method.

Bug: 15492979
Change-Id: I7d013541e8ed7708ce208cd4cf5d1c1d20d50e50
2014-06-10 13:40:09 -07:00
Adrian Roos
c42d33004d Update security method after switching user
Bug: 15445037
Change-Id: If296dd3ab6510c335aba7ffdce5cdd923ceada6b
2014-06-10 22:39:15 +02:00
Jorim Jaggi
80f5e3c08d DO NOT MERGE: Fix paddings for user switch and status bar icons.
Paddings approved by allysont@ for preview build.

Bug: 15540707
Change-Id: If7288d032b9625e0fbb5b657afcf680d178e63ee
2014-06-10 20:31:58 +00:00
Alan Viverette
eb29d330c3 Merge "Change ripple tint to color, remove tintMode" into lmp-preview-dev 2014-06-10 20:14:30 +00:00
Jorim Jaggi
598622df8c Merge "Do not override mColor with default color if none set" into lmp-preview-dev 2014-06-10 20:03:23 +00:00