Lorenzo Colitti
e258de6f9e
Merge "Rework the per-network URL API." into lmp-dev
2014-08-22 03:07:28 +00:00
Lorenzo Colitti
9f1274b7e4
Rework the per-network URL API.
...
This addresses API council comments.
Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
2014-08-21 19:09:27 -07:00
Adam Powell
13c3d9622f
Merge "Directly propagate Activity titles to action bars" into lmp-dev
2014-08-22 01:18:23 +00:00
Adam Powell
a557fdcfb8
Directly propagate Activity titles to action bars
...
Window decor action bars already inherit window title changes if no
explicit action bar title has been set but from an Activity's
perspective setting the activity title is a stronger signal. This is
especially relevant when the activity's action bar has been provided
by the application in the form of a Toolbar.
Bug 17138048
Change-Id: Ibf042cab6bbda3dc29590c09d1a0910b6ba78870
2014-08-21 18:05:53 -07:00
Alan Viverette
87545c5a24
Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev
2014-08-22 01:02:02 +00:00
Jeff Sharkey
8e28c9c315
Merge "Guard against EOF when reading in FileBridge." into lmp-dev
2014-08-22 00:58:02 +00:00
Jeff Sharkey
5f1ed727e2
Guard against EOF when reading in FileBridge.
...
Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322
2014-08-21 17:54:29 -07:00
Eino-Ville Talvala
2d9a18e02e
Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev
2014-08-22 00:46:41 +00:00
Yin-Chia Yeh
6fc6748ffb
Merge "Camera2: add toString for two params classes" into lmp-dev
2014-08-22 00:20:06 +00:00
George Mount
99db6030e1
Merge "Add Parent Change to ChangeTransform" into lmp-dev
2014-08-21 23:00:05 +00:00
Dake Gu
c94e2b393f
Add Parent Change to ChangeTransform
...
Bug 16460123
Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.
Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
2014-08-21 15:50:17 -07:00
Igor Murashkin
b68654ce84
Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev
2014-08-21 22:33:29 +00:00
George Mount
7762e8e798
Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev
2014-08-21 22:26:57 +00:00
George Mount
b89d5cc2c6
Allow Activities to opt into using Overlay for shared elements.
...
Bug 17001227
Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
2014-08-21 14:30:51 -07:00
Eino-Ville Talvala
edecaee1f2
Camera2: Fix return type of CaptureFailure#getFrameNumber
...
Should be long, not int.
Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29
2014-08-21 14:28:50 -07:00
Alan Viverette
9468c6a28e
Clean up nullable listeners in date and time picker delegates
...
Removes the NO_OP listener from TimePicker since we actually do null
checks everywhere already.
BUG: 17179502
Change-Id: I39a7d68253845c004027e31c59afc43be42195b7
2014-08-21 13:56:54 -07:00
Adam Lesinski
b5136731b2
Merge "Report the right resource version in am get-config" into lmp-dev
2014-08-21 20:39:00 +00:00
Matthew Williams
bafeeb9813
JobScheduler needs to flush queue on charging
...
Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
2014-08-21 20:37:06 +00:00
John Reck
2b5d920e80
Merge "Fix supporting modifying listeners in callbacks" into lmp-dev
2014-08-21 20:18:56 +00:00
Alan Viverette
04e723c1af
Merge "Jump drawable state (including ripples) on view detach" into lmp-dev
2014-08-21 20:03:03 +00:00
Alan Viverette
d78a44576c
Jump drawable state (including ripples) on view detach
...
BUG: 15350931
Change-Id: I09928f59fb7b9f6d87b1f5219353a41ae6b5681d
2014-08-21 12:57:45 -07:00
John Reck
3b27e59e1e
Fix supporting modifying listeners in callbacks
...
Bug: 17179442
Change-Id: I2d64f86395c0b1befb5c10b9c696330db1c96821
2014-08-21 12:37:48 -07:00
Adam Lesinski
ebc3e4cbf1
Report the right resource version in am get-config
...
Change-Id: I79ed3db45d91d8ec7e6f67608533ce3adf22ab27
2014-08-21 12:21:45 -07:00
Andre Eisenbach
491cb3f578
Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev
2014-08-21 17:56:25 +00:00
Andres Morales
6a12e77194
Merge "Remove old NFC unlock api" into lmp-dev
2014-08-21 17:07:32 +00:00
Dianne Hackborn
198d928615
Merge "Fix issue #17038762 : Add API to add entries to the recents list" into lmp-dev
2014-08-21 16:56:18 +00:00
Chris Craik
c56a1a51a9
Merge "Clarify text shadow attribute/method comments" into lmp-dev
2014-08-21 16:46:53 +00:00
Nicolas Prevot
01e6a6fef1
Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev
2014-08-21 16:33:47 +00:00
Paul Lawrence
7bf41929f2
Merge "Save PatternVisible setting to crypto header" into lmp-dev
2014-08-21 16:25:56 +00:00
Nicolas Prevot
465acf3f3f
Marking the methods to get Profile/Device Owner with @SystemApi.
...
BUG: 16860239
Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
2014-08-21 17:22:28 +01:00
Zhijun He
eee850d355
Merge "Camera2: update aberration correction related tag name" into lmp-dev
2014-08-21 16:17:52 +00:00
Jaewan Kim
edaece1f30
Merge "TIF: Accept any character for custom label." into lmp-dev
2014-08-21 16:13:25 +00:00
Jaewan Kim
f0e530e4eb
TIF: Accept any character for custom label.
...
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
2014-08-22 01:05:40 +09:00
Kenny Guy
7a13ea7e3b
Merge "Replicate text and sounds settings for managed profile." into lmp-dev
2014-08-21 15:55:43 +00:00
Esteban Talavera
e4be1bf2be
Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev
2014-08-21 15:33:20 +00:00
Yin-Chia Yeh
97376d90d6
Camera2: add toString for two params classes
...
Add toString for RggbChannelVector and ColorSpaceTransform.
Also change ColorSpaceTransform equals implementation to actually
compare the underlying rationals.
bug 16963063
Change-Id: I858153b405bc3541959be79962db750d429413a3
2014-08-21 08:28:17 -07:00
Esteban Talavera
5cef4fa9c1
Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev
2014-08-21 15:21:59 +00:00
Jorim Jaggi
922fb7a7db
Merge "Update notification layouts to match redlines" into lmp-dev
2014-08-21 15:21:22 +00:00
Kenny Guy
6460657d0e
Replicate text and sounds settings for managed profile.
...
Replicate touch sound / vibrate setting and show password
setting between managed and parent user.
Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733
2014-08-21 16:19:35 +01:00
Jorim Jaggi
445d3c0a6f
Update notification layouts to match redlines
...
Also fixes a lot of paddings and other small issues with
the notification layouts.
Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
2014-08-21 17:13:55 +02:00
Esteban Talavera
2df7d1ef51
Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
2014-08-21 14:58:18 +00:00
Esteban Talavera
d5c5c13c85
Rename get/setBlockUninstall() to get/setUninstallBlocked()
...
As requested in the API review
Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
2014-08-21 15:30:13 +01:00
John Reck
94f6878bbd
Merge "Run RevealAnimator on RT" into lmp-dev
2014-08-21 14:23:29 +00:00
Esteban Talavera
8c5c373647
Merge "Remove setApplicationsHidden" into lmp-dev
2014-08-21 14:17:25 +00:00
Esteban Talavera
d469a0b9ce
Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
...
As requested in the API review.
Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
2014-08-21 14:58:14 +01:00
Esteban Talavera
1aee98fbf3
Updated documentation for setScreenCaptureDisabled()
...
As requested in the API review. Also, removed unused import.
Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f
2014-08-21 14:03:55 +01:00
Niels Egberts
5e5ee9945b
Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev
2014-08-21 11:33:01 +00:00
Kenny Guy
b9e468cb9d
Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev
2014-08-21 10:54:26 +00:00
Niels Egberts
b9f7692ce6
Fixed spelling of android.nominative and updated some comments.
...
Bug: 17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f
2014-08-21 11:28:29 +01:00
Esteban Talavera
115cd65d2a
Remove setApplicationsHidden
...
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.
Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
2014-08-21 10:29:38 +01:00