Commit Graph

41811 Commits

Author SHA1 Message Date
Alan Viverette
ef7ebbdff1 Merge "Allow medium-long-press to initiate drag-to-open menus" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
bca05f5ce7 Allow medium-long-press to initiate drag-to-open menus
BUG: 16352041
Change-Id: I58933ae8cce1b3cecc1c533338d02a2f6ef1523b
2014-07-23 20:15:44 -07:00
Yorke Lee
fd4354a9ee Merge "Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL" into lmp-dev 2014-07-23 18:31:55 +00:00
Jungshik Jang
b6591b8e53 Implement OneTouchRecordAction and stop one touch record.
In addition to it, add api for clearTimerRecording as well.
Separately, I will replace logic for notifying message with callback
interface.

Bug: 16160962

Change-Id: I2368f7c697eb44ed4542c0ec4412c63a6ae41a5c
2014-07-24 11:11:38 +09:00
Yorke Lee
624d0d64ab Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL
Change-Id: I6e1a4811f822f2211070edd7c9aa486005e53cea
2014-07-23 19:09:27 -07:00
Jungshik Jang
f3fa471d96 Add @hide and @SystemApi to HdmiTimerRecordSources
Change-Id: I3938b26af4ca2fe8d70224bd7bac30ba627d6d44
2014-07-24 09:56:28 +09:00
Geoffrey Borggaard
7968b28ad8 Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 2014-07-23 18:25:52 +00:00
Geoffrey Borggaard
987672d262 Fixes setting password through DevicePolicyManager
LockPatternUtils wasn't taking the userId into account when
looking up the salt.
Bug: 16204999

Change-Id: I0626b5a0a55c244122c24fb4446f270918f3187c
2014-07-23 20:03:51 +00:00
Tao Bai
67ac461a0a Merge "WebView permission change" into lmp-dev 2014-07-23 18:56:15 +00:00
Tao Bai
2871febb19 WebView permission change
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think

BUG: 15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
2014-07-23 12:16:55 -07:00
Eino-Ville Talvala
2f75e7d7ef Camera2: Fix callback operation
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
  semantics

Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
2014-07-23 19:14:10 +00:00
Prerepa Viswanadham
8caac741a0 Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
2014-07-23 18:54:46 +00:00
Ye Wen
e5ebd4bc76 Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 2014-07-23 17:52:05 +00:00
Ye Wen
b87875eb88 Infer legacy network type for ConnectivityManager.requestNetwork
ConnectivityManager.requestNetwork pass TYPE_NONE to
sendRequestForNetwork which prevents it from being used with legacy API
requestRouteToHostAddress. This CL infers the legacy network type
automatically from the network capabilities.

b/16324360

Change-Id: I591d38f875f42f56e8cfc157db2069c9eee0ee26
2014-07-23 11:41:17 -07:00
ztenghui
5a836f74df Add negative sign separation support in the pathData
bug:14585171

Change-Id: I61dec27856be09c44bb1d32ff61b3c3cd458cc34
2014-07-23 21:46:16 +00:00
Alan Viverette
f84bc66b21 Merge "Use activity for brightness dialog" into lmp-dev 2014-07-23 18:50:38 +00:00
Jae Seo
80bc75a71e Fix build
Change-Id: Icc1bf76ef748b10cc7ea745bc37c4e7bc0d7ff43
2014-07-23 13:16:46 -07:00
Wei Wang
3e2bbda757 Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 2014-07-22 16:29:55 +00:00
Wei Wang
03259472b1 Fix parcel issues with empty service uuid. Added tests.
b/16490816

Change-Id: If26a4731f22e83df4f5ded2ad76901de6c49a010
2014-07-23 10:23:10 -07:00
Alan Viverette
ed8e09b664 Remove dialog icons
BUG: 16493564
Change-Id: Ica59abb70a924cccd705172d323a535ef9b75cf1
2014-07-22 18:41:37 -07:00
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking().
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
2014-07-23 11:18:57 -07:00
Brian Attwell
e98a95c156 Add PICK_JOIN_CONTACT_ACTION action contact
This ContactsContract change is needed by ag/509090

Bug: 16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
2014-07-23 18:11:13 +00:00
Carlos Valdivia
75111d83e6 Merge "Allow authenticators to rename accounts." into lmp-dev 2014-07-22 16:21:19 +00:00
Chris Craik
c403a39089 Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 2014-07-22 22:02:55 +00:00
Chris Craik
0645128b80 Make setter methods on Outline call setEmpty() based on params
bug:16142564

Additionally, better define behavior around null outline providers:

A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.

Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
2014-07-22 15:15:11 -07:00
Sandeep Siddhartha
0edc8cea2b Merge "Make hotword availability a callback" into lmp-dev 2014-07-22 20:44:55 +00:00
Alan Viverette
77e5037d81 Update spinner asset, fix default popup context and elevation
BUG: 15985882
Change-Id: Ica8c2597c35bd3012da11e315a93bbd1df2f3f38
2014-07-23 00:18:07 +00:00
Sandeep Siddhartha
f63bc523ea Make hotword availability a callback
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.

Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa

Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
2014-07-22 17:11:52 -07:00
Chong Zhang
f3d00e4e0a update battery stats for audio/video
Bug: 12979595

Change-Id: I581376cb88a2d14dc4bad77d454b9bba73d0eb9b
2014-07-23 00:01:46 +00:00
Sreeram Ramachandran
03666c705d Cleanup: Delete dead code.
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
2014-07-22 15:46:34 -07:00
Dianne Hackborn
4bd39ec448 Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 2014-07-22 16:29:55 +00:00
Dianne Hackborn
10eaa8574b Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
Also add new methods to clear these states, so we can avoid any
nesting issues from getting the tracking state stuck.

Change-Id: Iba0eaba2a9a186355c24d392f16118982c5331ed
2014-07-23 17:05:04 +00:00
Sander Alewijnse
0c1dcfd161 Merge "Add Device Policy API to disable screen capture." into lmp-dev 2014-07-23 05:48:23 +00:00
Sander Alewijnse
d2a1eec400 Add Device Policy API to disable screen capture.
WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.

Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
2014-07-23 13:44:28 +00:00
Chris Wren
cf7ed58308 Revert "Honor the sort and group keys for notification ranking."
This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189.

Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
2014-07-23 12:41:37 +00:00
Chris Wren
4a24fd3c7b Honor the sort and group keys for notification ranking.
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Bug: 15190903
Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
2014-07-23 10:36:57 +00:00
Narayan Kamath
0c434aed47 Merge "Add an internal API to get all asset locales." into lmp-dev 2014-07-23 05:48:23 +00:00
Narayan Kamath
37197df479 Add an internal API to get all asset locales.
This will allow us to not copy paste this code verbatim into
bundled apps.

bug: 10090157

(cherry picked from commit 9e6d9d4c81)

Change-Id: I34690a2b6dad51f1592f37d3c2a8c81345632c2f
2014-07-23 11:17:30 +01:00
Narayan Kamath
4c6ce23816 Remove copy of Locale.adjustLanguageCode.
(cherry picked from commit 1d31a5f824)

Change-Id: I7b30a153a44dc1f99a9ddfe256b770d7305a74b7
2014-07-23 11:09:26 +01:00
Jungshik Jang
bffb0635aa Add startTimerRecording api to IHdmiControlService.
In order to support timer recording we need separate API,
startTimerRecording. Also added HdmiTimerRecordingSources
which is used to help creating timer recording information
such as timing information and program information.

Besides, in order to distinguish one touch record
and timer recording, rename startRecord with startOneTouchRecording.

Bug: 16160962
Change-Id: I8c3d4034665a2f84ddf07135aee73e17ac17cd82
2014-07-23 16:12:10 +09:00
Narayan Kamath
c9e2716f7b Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 2014-07-23 05:48:23 +00:00
Bryan Mawhinney
e191f901d9 Store actions passed to MediaStyle.setShowActionsInCompactView in extras
So that they can be bridged appropriately by Android Wear

Change-Id: I3a21a74991c8067ece1a04fbd0b92dd21438e0fd
2014-07-23 08:49:28 +00:00
Jeff Davidson
5ad20790a1 Expose NETWORK_SCORE_SERVICE as @SystemApi.
Bug: 15833200
Change-Id: Ide17bf0065ca7f5ab13e913dd6078b6c62741243
2014-07-23 09:41:40 -07:00
Jungshik Jang
a87c384f2b Merge "Fix unknown tag @throw" into lmp-dev 2014-07-23 01:10:40 +00:00
Jungshik Jang
a00161675f Fix unknown tag @throw
Change-Id: I8c017a83175c447d02d8eb28f571e31921ae77c6
2014-07-23 23:30:00 +09:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking.
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
2014-07-23 09:45:25 -04:00
Paul Soulos
2dcab18c6c Adds ScrollBounds to the Transition framework
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
2014-07-22 14:17:48 -07:00
Alexandra Gherghina
0e9ac20d7e Do Not Merge Per-user API for master sync
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
2014-07-22 20:15:45 +00:00
Igor Murashkin
0986121807 Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 2014-07-22 16:21:19 +00:00
Igor Murashkin
6c76f58f31 camera2: Add legacy available Request/Result/Characteristics keys
* Also changes the CameraMetadata#get*Keys to not return @hide keys

Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc
2014-07-22 13:10:29 -07:00