139124 Commits

Author SHA1 Message Date
Dianne Hackborn
34468351ed Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Dianne Hackborn
94d9370142 Fix calling startConfirmation instead of startCommand.
Duh!

Change-Id: Ia9785a1ab37e38b7a044c2d389a1015a209654c9
2014-06-11 13:23:18 -07:00
Selim Cinek
1e119db1a3 Changed the visual appearance of the speedbump view.
The colorfulldots are replaced by a simple line to avoid
catching too much attention.

Bug: 15188625
Change-Id: I41be50dcc61d495f3bc88e4731388f770fda83d0
2014-06-11 19:53:18 +00:00
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
Eino-Ville Talvala
e600d6ad60 Camera2: Misc + enum value documentation updates
- Update enum values for many entries
- Reword various sections of documentation for clarity.

Bug: 15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
2014-06-10 15:12:46 -07:00
Dianne Hackborn
6de057816f Merge "Implement control of auto power save mode." into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Dianne Hackborn
14272302a8 Implement control of auto power save mode.
Follow the setting for auto power save mode in both
battery service and battery UI.  Default level is 15 when
setting is not set; otherwise it is whatever the setting
gives, with 0 meaning auto battery save is off.

Change how we define the "turn off warn" level to be
an adjustment from the warn level, so we can have a good
value for whatever auto setting is set.

Fix power manager to never go in to power save mode when
plugged in, even if the user has manually turned it on.

Add new delete option to settings command, because I needed
it for testing.

Change-Id: I512b691df84399d50b8e751fd50732c6093ebe85
2014-06-11 10:34:26 -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
Matthew Williams
46919f3583 Fix build.
Two tests were breaking the build.

Change-Id: If424a552d3fedb912fa94870b88c60dc3750b69a
2014-06-10 16:11:08 -07:00
Dianne Hackborn
e4ad633a36 Merge "Some tweaks to improve document task creation." into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Dianne Hackborn
d38aed8142 Some tweaks to improve document task creation.
- Mark the chooser activity as never launching in to a new
  task, even if the caller asks for it.  These are dialogs
  so don't make sense as stand-alone tasks.  (Maybe later
  the policy should be to not launch into a new task in any
  case that the activity is a dialog or even transparent at all.)

- Keep track in the task record of whether any activities in
  it have been shown to the user, and use this to automatically
  remove the task when all activities finish.  This leans up
  cases where apps are launching stub activities that get turned
  in to tasks but are never seen by the user because they
  immediately launch another activity in another task and
  then finish.

Change-Id: I00b641c80aa96bd5071479f36ee2e4d8e3a81aeb
2014-06-10 21:49:48 -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
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +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
Elliott Hughes
1a3908e959 Merge "Switch to a type-safe album art interface." 2014-06-10 21:55:12 +00:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface.
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
2014-06-11 14:43:57 -07:00
Deepanshu Gupta
92b7c67e71 Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 2014-06-10 21:55:02 +00:00
Deepanshu Gupta
9c80488e11 LayoutLib fixes for API 20 [DO NOT MERGE]
Fixes a bunch of issues with delegate method signatures.

Also cherrypicked commit 664d6f1fe4d6dfa742b3e98051f924dbc190f8ca
which is needed in this branch also.

Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330
2014-06-12 19:48:38 +00:00
John Reck
de233aec5a Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev 2014-06-10 21:55:02 +00:00
John Reck
c60676624c DO NOT MERGE Disable AtlasInitializer
Bug: 15425820

Change-Id: I15270eb7a5856523625e2de48ef9efc2520ddb0f
2014-06-11 15:53:53 +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
George Mount
530ae0a5ec Merge "Allow customization of background fade duration." 2014-06-10 21:44:22 +00:00
Anil Muthineni
5d3c5fc115 Add api to inject SMS PDUs
Change-Id: I58a518a7a6d6f43fef3d989bc0c8b21959404ed0
2014-06-12 17:44:22 +00:00
George Mount
ed1e01d7e4 Allow customization of background fade duration.
Bug 15195468

Change-Id: I02c1ef446cfa8aaedce640ab5694b6d9245bb9f7
2014-06-12 10:33:53 -07:00
Prerepa Viswanadham
9ad537d7db Merge "Take out startScanWithUuidScanParam as part of refactoring" 2014-06-12 17:09:07 +00:00
Prerepa Viswanadham
58a01d6ab1 Take out startScanWithUuidScanParam as part of refactoring
Change-Id: Icfb9083571e22c0853fc64ad4d09a20cbf754257
2014-06-12 10:39:29 -07:00
Jeff Brown
98908aa0c9 Merge "Add call to set power mode for display" 2014-06-12 17:09:07 +00:00
Vinit Deshpande
daf215cf95 Support scanning using band specification instead of channels
This change enables scanning with band specification instead of channels,
this should ease app development.

Also includes a bug fix for parcel serialization/deserialization.

Change-Id: Idbffce4805b403bf8fe1efae999cb828e09c2420
2014-06-12 08:34:44 -07:00
Vinit Deshpande
e344cb2268 Fix an NPE in WifiScanner while reporting description
Change-Id: Ie9d12e19e0b8ca98c6ec4c6fa5222a2f28983e64
2014-06-12 08:34:44 -07:00
Yuhao Zheng
0811cbee48 Merge "Wifi passpoint - linking APIs" 2014-06-12 03:30:50 +00:00
Chris Craik
3e136626da am 69453787: Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev
* commit '6945378752381a04d81eb426876a6495488cd459':
  Fix race in shadow tessellation by deep copying task params
2014-06-12 16:54:18 +00:00
Dianne Hackborn
eebf7b954e am 0324f4b6: Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev
* commit '0324f4b651e2e02319c580c16aee8d815a9beb24':
  Fix calling startConfirmation instead of startCommand.
2014-06-12 16:54:09 +00:00
Selim Cinek
c45d5d2aa4 am 0984a93c: Changed the visual appearance of the speedbump view.
* commit '0984a93c5df33cc044a86e04e6dbe68d58027352':
  Changed the visual appearance of the speedbump view.
2014-06-12 16:54:03 +00:00
Eino-Ville Talvala
bb373e601f am e941070b: Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev
* commit 'e941070bd7ab910b558bbace38e2ff813fa0327c':
  Camera2: Misc + enum value documentation updates
2014-06-12 16:53:54 +00:00
Robert Greenwalt
1a6116922f am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev
* commit 'fe5ca9646f86e041ed7729ecd0a006428806acf2':
  Fix public API of LinkProperties.
2014-06-12 16:53:43 +00:00
Yuhao Zheng
ef9ef71a77 Wifi passpoint - linking APIs
cherry-pick from kwd:

99d4cc Wifi Passpoint - linking credential match API
https://partner-android-review.googlesource.com/#/c/59247/

b5f5ef Wifi Passpoint - linking OSU API
https://partner-android-review.googlesource.com/#/c/59282/
2014-06-11 15:38:55 -07:00
George Mount
4a7c3af299 Merge "Prevent transitions from calling createAnimator for invalid views." 2014-06-10 22:18:15 +00:00
George Mount
208dcade93 Prevent transitions from calling createAnimator for invalid views.
Bug 15285527

When two transitions affect different views, createAnimator is
on all Transitions for all views. This CL prevents createAnimator
from being called for Transitions that don't target a view.

Change-Id: I3f70a13b4ea38ad4a9b4724db438b40f6e80eafb
2014-06-11 13:14:32 -07:00
George Mount
426a768974 Merge "Make more descriptive exception for null viewName." 2014-06-10 22:12:51 +00:00
George Mount
d5f9d735b7 Make more descriptive exception for null viewName.
Bug 15114583

Change-Id: I73db179e032947843e3f9a7f1cc5228cbf6fc22b
2014-06-11 13:00:11 -07:00
George Mount
e089d06151 Merge "Allow enter activity transitions to be delayed until data is ready." 2014-06-10 22:06:31 +00:00
George Mount
8c2614ce43 Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:03:43 -07:00
John Spurlock
7baacb177b Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
John Spurlock
3332ba54ae Heads-up notifications for low battery warnings.
Falls back to dialogs when heads-up are N/A.

Add new ongoing notification if battery saver mode
is active.  Offer to start battery saver on warnings,
if not already started.

True up BatteryMeterView's levels to the latest threshold
levels.  15% for first warning.

Bug:13329308
Change-Id: Id8ad11a1997079ee7165ae003a8fa1c744462ab3
2014-06-11 19:38:00 -04: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