138913 Commits

Author SHA1 Message Date
Dianne Hackborn
439688cf39 am 6d758619: Merge "Implement control of auto power save mode." into lmp-preview-dev
* commit '6d758619d90a0dda7f1136dcd44d0ac02cdada7e':
  Implement control of auto power save mode.
2014-06-12 00:03:55 +00:00
Dianne Hackborn
104e14531c am f894cad0: Merge "Some tweaks to improve document task creation." into lmp-preview-dev
* commit 'f894cad093c1a3083f4aca099babc4677977a12f':
  Some tweaks to improve document task creation.
2014-06-12 00:03:48 +00:00
John Spurlock
615166639b am a6522c40: Merge "SystemUI asset update." into lmp-preview-dev
* commit 'a6522c40e44c9b8c6dc551ab05c7b0ddfbfdac75':
  SystemUI asset update.
2014-06-12 00:03:40 +00:00
justinzhang
34576c6ace am 8b00d123: (-s ours) Hide status bars in lock task
* commit '8b00d123ec3154482644d2ebe913326552b47321':
  Hide status bars in lock task
2014-06-12 00:03:33 +00:00
vandwalle
6a9ef94bf4 Merge "auto-roam initial implementation" 2014-06-11 21:23:31 +00:00
Sol Boucher
8d336682d4 Merge "Add CameraToo, a sample point-and-shoot camera app" 2014-06-11 23:10:23 +00:00
Sol Boucher
b84fdffad4 Add CameraToo, a sample point-and-shoot camera app
It demonstrates basic use of the features of the new Camera2 API.

Change-Id: I593bc682e5c6203754e9a3ee9a78efbd1b208513
2014-06-11 21:47:49 +00:00
Craig Mautner
0aad830d1b am 28084383: am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit '28084383c13660864f75452f99183c377c2798ec':
  Add NO_ANIMATION flag to ActivityView Intents.
2014-06-11 21:38:49 +00:00
Calin Juravle
9c9777da68 am cdd1fd7a: am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 21:38:43 +00:00
Calin Juravle
a48a6fd1f2 am 5fc4e487: am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '5fc4e487420b7730c9eaf2623ff1efd2633daba7':
  Improved profile.start-immediately comment
2014-06-11 21:38:38 +00:00
vandwalle
111fa0274d auto-roam initial implementation
Change-Id: Iad207974b2fea97420cc6131c5fa0a1f17bf2aac
2014-06-11 14:38:06 -07:00
Kenny Root
90c392fd2d resolved conflicts for merge of 579ace03 to master
Change-Id: I461879359824036ec861ad9b5b8804ae814179a9
2014-06-11 14:31:56 -07:00
Craig Mautner
28084383c1 am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.
2014-06-11 17:42:06 +00:00
Calin Juravle
cdd1fd7a8f am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 17:32:50 +00:00
Calin Juravle
5fc4e48742 am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment
2014-06-11 17:32:40 +00:00
Calin Juravle
b0492d6943 am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit '16719591f4a6b2139b1f3555dcde92d35f488b6a':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 17:28:33 +00:00
Calin Juravle
b0f59cdcb4 am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '2f84b69bf5afcf67469704e30866067b770ae786':
  Improved profile.start-immediately comment
2014-06-11 17:28:29 +00:00
justinzhang
800c103495 Hide status bars in lock task
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)

Bug: 13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
(cherry picked from commit cc2365ac9eae0393154c863a21286c9a95311e15)
2014-06-11 14:53:28 +00:00
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
579ace0358 am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
2014-06-11 01:18:36 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
2014-06-10 15:31:48 -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
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
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
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
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
Leon Scroggins
84ecb7e1aa Merge "remove call to (deprecated) SetDeviceConfig" 2014-06-10 21:44:22 +00:00
Mike Reed
2216f9c2e5 remove call to (deprecated) SetDeviceConfig
this was ignored by all callers, in that they always specify a preferred config (8888).

This removal will allow skia to remove the api and its global.

Change-Id: Ic0a4c673ddd60d0078f75e0e482aba4c9b9cf682
2014-06-11 16:08:31 +00:00
Sreeram Ramachandran
7ac927873c Merge "Fix wifi connectivity issues." 2014-06-10 22:18:15 +00:00
Sreeram Ramachandran
211c06eb81 Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
2014-06-11 15:56:51 -07:00
Robert Ly
e37da759c5 am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit 'b1cb5aabeb68815715eed423f1f9a7edb9a3e938':
  Add documentation for AndroidKeyStore
2014-06-11 19:33:51 +00:00
Justin Koh
41a2c47e65 am 44195b4f: am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev
* commit '44195b4f90d035533c879672891e7e169972d95d':
  Catch OperationUnsupportedException when linkifying using WebView
2014-06-11 19:33:46 +00:00
Justin Koh
69b8b79a4f am 7b9fa3bd: am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser
* commit '7b9fa3bd11f73bc201a404e8dacf7c02c15290b7':
  Remove WebIconDatabase calls from android.provider.Browser
2014-06-11 19:33:40 +00:00
Ruben Brunk
ef1b1398e9 fixbuild: Remove 'pinned' attr.
Needed by ag/481620

BUG: 15523923
BUG: 15473856

Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
2014-06-11 11:56:58 -07:00
John Spurlock
2d848a7741 am 9641b929: Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev
* commit '9641b929ae730241c37c8da21092cf56230aa05f':
  Brightness slider no longer displays the automatic icon.
2014-06-11 17:43:49 +00:00
Svetoslav
a43e79cfcd am 6af2b51b: Merge "Accessibility window changes not reported." into lmp-preview-dev
* commit '6af2b51b3c233d2c9d77282355c798c01a8afba1':
  Accessibility window changes not reported.
2014-06-11 17:43:42 +00:00
Deepanshu Gupta
9ad11ca07f am e3e1591c: Merge "Remove lxml dependency." into lmp-preview-dev
* commit 'e3e1591cd8d748ba5da228fe857dd785ec7965a9':
  Remove lxml dependency.
2014-06-11 17:43:36 +00:00
Deepanshu Gupta
6370c7f554 am fe01ace8: Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev
* commit 'fe01ace8ac5da2c9716a0eb0cb53fdda823b3910':
  LayoutLib: Support more ContextThemeWrappers
2014-06-11 17:43:32 +00:00
Deepanshu Gupta
3e950680c4 am 0a89c1b0: Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev
* commit '0a89c1b00762b404966e32beef1ea9a53e4a8b08':
  LayoutLib: Fix EditText rendering
2014-06-11 17:43:26 +00:00
Christopher Tate
70c1de2072 am 40c042b8: Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev
* commit '40c042b884696d162468d971630c48eebd84475b':
  Hide the (obsolescent) android.app.maintenance APIs
2014-06-11 17:43:20 +00:00
Lorenzo Colitti
a23f56b95c am 34852095: Merge "Don\'t enable Ethernet on the emulator." into lmp-preview-dev
* commit '34852095d9148945edc39c2df9513c41998eb55b':
  Don't enable Ethernet on the emulator.
2014-06-11 17:43:15 +00:00
Ruben Brunk
9696db1b8b am ec346985: (-s ours) Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev
* commit 'ec3469853d18e18fd383dae691970dc0fb7ee0da':
  DO NOT MERGE: camera2: Disallow shim usage for preview.
2014-06-11 17:03:20 +00:00