5435 Commits

Author SHA1 Message Date
Christoph Studer
3d5e26d659 am 09473140: am 0b928f7d: am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev
* commit '0947314029aa6c40f875703356a9c06417d356a8':
  Strip RemoteViews from Notifications, re-create them in SysUI
2014-07-30 19:45:02 +00:00
Sandeep Siddhartha
9a576f2174 am 041b0b6e: am ae7848f4: am 059ffa19: Merge "Make startRecognition async" into lmp-dev
* commit '041b0b6ef8cd61014c5d00e05e0c2d322d675c42':
  Make startRecognition async
2014-07-30 19:15:02 +00:00
ztenghui
9f0fbaee64 am 1aa0970e: am 3520c8a9: am da818af6: API Review: VectorDrawable. Remove clipToPath, add MiterLimit
* commit '1aa0970e75158557b032cf7bfc8db778debffbab':
  API Review: VectorDrawable. Remove clipToPath, add MiterLimit
2014-07-30 17:17:16 +00:00
Yorke Lee
91f0295c8d am 9b5e2dd5: am 9dfe2c4d: am f4c289dc: Merge "ContactsContract API changes" into lmp-dev
* commit '9b5e2dd5abbb46d07b3633010124cfef521816fe':
  ContactsContract API changes
2014-07-30 17:11:20 +00:00
Kenny Guy
868428460a am 1c694e7e: am 39dbf079: am 7d31e8dc: Merge "Add optional handler to LauncherApps callback" into lmp-dev
* commit '1c694e7e746766822e0c55548a01dca652f73264':
  Add optional handler to LauncherApps callback
2014-07-30 16:53:42 +00:00
Jae Seo
9e96af9848 am a6377bb1: am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager
* commit 'a6377bb178192f54a761325ff951a59cacd1d6e6':
  TIF: Merge TvParentalControlManager into TvInputManager
2014-07-30 16:53:00 +00:00
Jae Seo
59016be39c am 3a4781a0: am f38c8185: am af0f27fa: TIF: Use more consistent constant names
* commit '3a4781a03bb9fcdec71f39c0020f339cd99d67fa':
  TIF: Use more consistent constant names
2014-07-30 16:52:56 +00:00
Aravind Akella
bb9e3ee435 am 8b9de74e: am 05f855b4: am 1fde001f: Merge "SensorManager API changes." into lmp-dev
* commit '8b9de74e2bd522c5f97c64f7c085bfc0f8508053':
  SensorManager API changes.
2014-07-30 16:52:31 +00:00
Tyler Gunn
a71e4c040c am 5388708b: am edeba32e: am c5d8facb: Adding video width/height to camera capabilities.
* commit '5388708ba147432131bddc0d62f9372de3cd3410':
  Adding video width/height to camera capabilities.
2014-07-30 16:52:14 +00:00
Eino-Ville Talvala
fad9cd4746 am a9545b21: am 5496085d: am c02b64b6: Camera2: API review updates
* commit 'a9545b21509c07541a3637dcd1eb34a4c765edc2':
  Camera2: API review updates
2014-07-30 16:51:36 +00:00
ztenghui
d511fc2fa4 API Review: VectorDrawable. Remove clipToPath, add MiterLimit
bug:16488254

Change-Id: I693fd46eaf9af016ea9cefe44b559e0aee7c8f03
2014-07-30 16:47:19 +00:00
Jae Seo
783645e99f TIF: Merge TvParentalControlManager into TvInputManager
This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
   action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
   TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
   loaded at boot by your internal system service.  It should _not_ be stored in
   a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
2014-07-30 15:39:39 +09:00
Jae Seo
6e62a1508c TIF: Use more consistent constant names
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
2014-07-30 11:46:41 +09:00
Tyler Gunn
5d231e1343 Adding video width/height to camera capabilities.
Bug: 16602621
Bug: 16573836
Change-Id: Idaca4b6d889bf7910fcc37bee7ef478e2fbe3af3
2014-07-30 00:07:46 +00:00
Eino-Ville Talvala
abd9d3c5c7 Camera2: API review updates
- Rename CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION
  to TIMESTAMP_SOURCE
- Remove StreamConfigurationMap#NO_MIN_FRAME_DURATION

Bug: 16402755
Change-Id: I6c30a1e931c9f064c22092d362bcc61bd88e2f8a
2014-07-29 23:30:34 +00:00
Aravind Akella
6fc1901b1a Merge "SensorManager API changes." into lmp-dev 2014-07-28 22:45:16 +00:00
Aravind Akella
0288ca63e3 SensorManager API changes.
i) Remove WAKE_UP_* sensor constants and corresponding string constants.
     ii) Add getDefaultSensor(int, boolean) API.

Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
2014-07-29 17:41:02 -07:00
Yorke Lee
38e2d104d8 Merge "ContactsContract API changes" into lmp-dev 2014-07-25 23:00:08 +00:00
Yorke Lee
94c8761dc5 ContactsContract API changes
* Make ContactCounts an interface
* Improve clarity of ContactCounts documentation
* Add PinnedPositions.undemote method, and hide the method name
constant that is only used for the internal implementation

Bug: 16403306

Change-Id: If8b5cad779293cb9a3b90e698b13481f79b2351f
2014-07-29 19:00:32 -07:00
Ihab Awad
edeb0d2104 Merge "Connection creation and service wiring for WiFi call managers (1/3)" into lmp-dev 2014-07-27 22:35:46 +00:00
Ihab Awad
f8b69887b4 Connection creation and service wiring for WiFi call managers (1/3)
Bug: 16469413
Change-Id: I019922f76f54d2fa376513a6284d6322959a8235
2014-07-29 15:14:33 -07:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
2014-07-29 15:09:45 -07:00
Yorke Lee
0d6ea71bcf Add new proximity sensors in Telecomm (1/3)
Add the following two APIs in Telecomm and use them in InCallUI
setProximitySensorOn
setProximitySensorOff(boolean turnScreenOnImmediately)

Bug: 16573954
Change-Id: I8219e9c659f4ea4493f5cd5c8bcaa95a98d180e2
2014-07-29 09:27:31 -07:00
Marcin Kosiba
eed396f792 Make webview text encoding and keySystemUUID mapping and error page public.
These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.

BUG: 11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
2014-07-29 15:17:07 +01:00
Sandeep Siddhartha
7f60d881b3 Merge "Make startRecognition async" into lmp-dev 2014-07-24 15:36:21 +00:00
Sandeep Siddhartha
1ed12ddb8c Make startRecognition async
- This is needed for telephony and audio integration which should happen via async callbacks
that'll end up starting/stopping recognition.

e.g. if a startRecognition happens when in a phone call - the onDetectionStarted will get called once the phone
call ends.

For now the transient stoppages due to internal reasons will not be propagated back to the client.

Bug: 16514535
Bug: 16515468
Change-Id: I1b2b8edd28f5c5e67c453f66c23e1a67a626114e
2014-07-30 11:43:41 -07:00
Andrew Lee
48332d622b Convert VideoState into an inner class.
- Add helper functions to make it easier to figure out properties of a
particular video state, to make things more convenient.
- Update references and documentation.

Bug: 16629892
Change-Id: I621532e8cab080afd56e5db739b9edbee6261f74
2014-07-29 13:35:59 -07:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
2014-07-29 12:49:50 -07:00
Bernhard Bauer
70f9fad939 Merge "Add a method to DevicePolicyManager to register a private key access listener." 2014-07-24 15:36:05 +00:00
Bernhard Bauer
6bd165d0eb Add a method to DevicePolicyManager to register a private key access listener.
BUG=15065444

Change-Id: I6ae8afa4f3514c0cace76d9cc0912287e90a79d5
2014-07-30 17:12:10 +01:00
Kenny Guy
b42c89bfb0 Add optional handler to LauncherApps callback
Allow caller to pass in handler to LauncherApps
when adding a callback.
Stop apps adding callbacks twice.

Bug: 16401733
Change-Id: I2e192091c1b79acb905d899e96d6dacd45e561da
2014-07-30 11:21:01 +00:00
Adrian Roos
1cc41c938c Merge "Make TrustAgentService a SystemApi" into lmp-dev 2014-07-24 15:36:04 +00:00
Adrian Roos
a06d5ca1d9 Make TrustAgentService a SystemApi
Bug: 16401527
Change-Id: I6d19281600bacac7c8a29afc07c39ca1d461d23c
2014-07-29 12:54:49 +02:00
Jim Miller
604e7558ef Add new DevicePolicyManager API to allow fine-grained TrustAgent management
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.

Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
2014-07-28 21:32:01 -07:00
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
2014-07-29 01:46:57 +00:00
Craig Mautner
22132d7950 Make affiliatedTaskId public and unhidden.
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().

Fixes bug 16546323.

Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
2014-07-28 21:10:16 +00:00
Yao Chen
c2c0bdc10a Merge "s/thumbnail/icon in the browsing api." into lmp-dev 2014-07-24 20:48:02 +00:00
Yao Chen
5f3e1f2a2d s/thumbnail/icon in the browsing api.
Change-Id: I73bf76ed9628872094db74aef48a8e68864d6b4d
2014-07-28 11:35:36 -07:00
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00:00
RoboErik
e0b8c378b7 Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-dev
* changes:
  Add context to MediaController constructor
  Add getPackageName to MediaController
  Expose a way to set a PendingIntent for restarting playback
  Finish plumbing for launch intents in sessions
2014-07-25 21:16:23 +00:00
RoboErik
031149cd5f Add context to MediaController constructor
This also adds a convenience method to MediaSession to allow getting
a controller instead of having to create and cache your own.

bug:16561220
Change-Id: I87f551a7474e71f1cf2f07e0e541c3a4515cd977
2014-07-28 11:02:15 -07:00
RoboErik
aa4e23bbb3 Add getPackageName to MediaController
This removes the MediaSessionInfo class and adds a method on the
controller to get the package name. This also converts code that
depended on the session's UUID to use the token for comparison or
the Tag in the case of test code that needs a string identifier.

Change-Id: Icb8dc76c70e23e897da8fd07651c524b96372bf9
2014-07-25 16:22:59 -07:00
RoboErik
b214efbb91 Expose a way to set a PendingIntent for restarting playback
This is to allow apps to set a PendingIntent to restart playback. This
is not persisted across reboots but will allow music to start playing
again for the life of the system. Only the most recent priority app with
a PI set will be cached. This also deprecates methods in AudioManager
that do this and unhides the unregister method in MediaSessionManager.

Change-Id: I66fbf5856333468d8cb8a3022809778ba00d426e
2014-07-25 16:22:18 -07:00
RoboErik
e34c09daf8 Finish plumbing for launch intents in sessions
This finishes out the plumbing for setting a launchable PendingIntent
on a session and getting it from a controller to launch an app's UI.

Change-Id: I0c9506e7c3f0ebf57070ca7e0d91324eb3fdd1e1
2014-07-25 16:22:17 -07:00
RoboErik
76fca4e177 Add getFlags and getSessionToken to MediaController
getFlags was hidden, should have been public. Also added getSessionToken
as a convenience method for apps to get the token used to create a
controller.

bug:15408392
Change-Id: Icb19b43ebb7e01727eec1a4e667dafcfc3b8d4eb
2014-07-25 16:22:16 -07:00
RoboErik
30674e91a2 Merge "Add getFlags and getSessionToken to MediaController" into lmp-dev 2014-07-24 20:48:02 +00:00
Andrew Lee
1418576521 Move VideoCallProvider into ConnectionService.
Bug: 16494880
Change-Id: I0778197d06fcd219db4a1e1fa065e69026254a99
2014-07-28 10:41:37 -07:00
Lorenzo Colitti
c473dc4e4f Add a getBoundURL method that returns a network-specific URL.
Change-Id: I4b57e675bb87064ab75dcc36b00fdc7a2987b86e
2014-07-28 16:16:58 +00:00
Evan Charlton
17a3814ac6 Merge "Make creating the Connection synchronous" into lmp-dev 2014-07-24 15:36:21 +00:00