137419 Commits

Author SHA1 Message Date
Chris Craik
ffdd37ff14 Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Chris Craik
1b3be0877a Fix race in shadow tessellation by deep copying task params
bug:15369119
Change-Id: Ica1445f06693b1cfd038cf3494afe1210d5507c1
2014-06-11 13:49:34 -07:00
Ruben Brunk
937c4dbb1f Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
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
486ed08899 Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Robert Greenwalt
8fe0d0c84c Merge "Fix public API of LinkProperties." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Robert Greenwalt
25702b3967 Fix public API of LinkProperties.
bug:15142362
(cherry picked from commit 51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-10 15:42:19 -07: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
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
John Spurlock
c830d8f3b1 Merge "SystemUI asset update." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
899f439a29 SystemUI asset update.
- Updated location icons.
- Updated no-sim, plumb up to QS.
- Updated zen mode synthetic notification icon.
- Updated color inversion icons.

Change-Id: I4849fbe11683feab37160c3d23502b01035de66a
2014-06-11 11:04:43 -04: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
Jessica Hummel
542588e3ba Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
2014-06-11 11:37:53 +01:00
Jorim Jaggi
1a8e848dc4 Merge "Fix blank lockscreen." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
Jorim Jaggi
0a27be899c Fix blank lockscreen.
Bug: 15281241
Change-Id: If315891274a97fa5cc579554b83b85cf3c87f0fb
2014-06-11 15:45:22 +02:00
Daniel Sandler
c776997e87 Clean up progress bars for media & other notifications.
Bug: 15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
2014-06-11 13:18:59 +00:00
Chris Wren
b6f4ba7a92 Merge "Only post interrupting notifications to the Heads Up." into lmp-preview-dev 2014-06-10 21:38:43 +00:00
George Mount
a035b56271 Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
George Mount
28a8d10805 DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:06:34 -07: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
Svetoslav
2f45055618 Merge "Accessibility window changes not reported." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Svetoslav
e16a5009cc Accessibility window changes not reported.
On accessibility service side we were asking only for cached windows but since
to optimize performance the system is sending only deltas for windows the service
already introspected, new windows were not seen by the accessibility service.

bug:15092286

Change-Id: I7e9c360f624c53ff1773c485a8907dc425e3352a
2014-06-11 01:05:04 +00:00
Deepanshu Gupta
352d84fb07 Merge "Remove lxml dependency." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Deepanshu Gupta
125714173b Remove lxml dependency.
The encoding for the .ttx file generated is now hard-coded to be utf-8.

Change-Id: I71c208327995651fcf44b6961510f84bafb05848
2014-06-10 17:00:29 -07: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
Deepanshu Gupta
1160e6d2f7 LayoutLib: Fix EditText rendering
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.

TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.

Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
2014-06-10 17:44:14 -07:00
Deepanshu Gupta
dc8455bdc2 Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Christopher Tate
d3bafe826b Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Christopher Tate
863d8af75a Hide the (obsolescent) android.app.maintenance APIs
Bug 14994893

Change-Id: If3c06de006504e81c37eb6b716d613e5124d28bc
2014-06-10 18:20:24 -07:00
Lorenzo Colitti
5592a725dd Merge "Don't enable Ethernet on the emulator." into lmp-preview-dev 2014-06-10 22:31:57 +00: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
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