Commit Graph

38686 Commits

Author SHA1 Message Date
George Mount
71d34ec5be Merge "Fix no transition when only shared element exists." into lmp-dev 2014-07-24 20:48:02 +00:00
George Mount
b4c5d7bf21 Fix no transition when only shared element exists.
Bug 16245703

Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4
2014-07-24 13:19:51 -07:00
Justin Morey
b5deda7382 Fix build
Change-Id: I8790b274864610b7e00d7ea12efe96b3b826301f
2014-07-24 10:53:40 -05:00
Adam Lesinski
d4bd75be4f Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 2014-07-24 15:36:09 +00:00
Prerepa Viswanadham
5bec5af971 cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
2014-07-24 19:28:12 +00:00
Svetoslav
f7c42c5067 Updated accessibility nodes not properly cached.
We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.

Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.

bug:15729762

Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3
2014-07-24 19:24:42 +00:00
Wei Wang
82a1cfa4fe Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev 2014-07-24 15:36:09 +00:00
Hector Dearman
d49d6bf0cd Merge "Update CookieManager API for Council review." into lmp-dev 2014-07-24 15:36:05 +00:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata.
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
2014-07-24 17:43:54 +00:00
Hector Dearman
ffae672881 Update CookieManager API for Council review.
Remove synchronized from setAcceptThirdPartyCookies

Bug: 16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877
2014-07-24 18:10:25 +01:00
Chris Craik
058fc64001 Connect shadow style attributes to renderer
bug:15859361

Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.

Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
2014-07-24 16:41:13 +00:00
Robert Ly
eb355efc1b am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '39572996f25d4b4ce744d9d04080e33b687ab03b':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-24 16:22:29 +00:00
Yorke Lee
feb2b8c0bf Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev 2014-07-24 15:36:09 +00:00
Yorke Lee
7a5e5726ab Add Calls.TRANSCRIPTION to CallLog (2/2)
Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.

Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795
2014-07-24 08:30:33 -07:00
Justin Morey
80440cc853 Expose setActiveProfileOwner() using @SystemApi
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
(cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)
2014-07-24 15:23:09 +00:00
Wei Wang
0e81ca2543 Move AdvertiseData length check to BluetoothAdvertiser.
This will keep AdvertiseData simple and avoid coupling with
BluetoothAdapter.

Change-Id: I3609652bdea1c6e757bac7d2dada7f8ddf20a5e3
2014-07-23 20:39:12 -07:00
Adam Lesinski
2c72b6822d Add <feature-group> tag and change aapt badging
A <feature-group> represents a set of features required
for an app to be compatible with a device. Multiple
<feature-group> elements represent a logical 'or'
of required features.

Features defined in the old way with <uses-feature> tags
under the <manifest> tag are automatically added to each
feature-group defined.

Defining a <feature-group> means that any default
features are not included (such as android.hardware.touchscreen)
and declared permissions do not imply any features.

Change-Id: I45626f0fdc546e47bcf2aead7ef05ebcca12b023
2014-07-23 14:11:46 -07:00
Robert Ly
39572996f2 am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-23 21:06:47 +00:00
Nicolas Prevot
2b122164c8 Merge "Making the clipboard work across users." into lmp-dev 2014-07-23 19:32:39 +00:00
Nicolas Prevot
f1939901d2 Making the clipboard work across users.
When copying from the parent: the ClipData can be pasted in the managed profile.
When copying from a managed profile: it can be pasted in the parent,
unless the policies says it's disabled. In which case, the clipboard of the parent becomes empty.
Supporting content uris.

BUG: 15186236

Change-Id: I522564a7c07ff21df137adcda980bb52e5739964
2014-07-24 10:25:57 +00:00
Neil Fuller
3b852e3489 Rewriting android.text.format.Time without the native _tz functions
(cherry picked from commit d7f0849b8c)
Bug: 15765976

Change-Id: I00f72bd1043ef20f22d25559206b2f741334ba9c
2014-07-24 11:37:20 +01:00
Jungshik Jang
f3fa471d96 Add @hide and @SystemApi to HdmiTimerRecordSources
Change-Id: I3938b26af4ca2fe8d70224bd7bac30ba627d6d44
2014-07-24 09:56:28 +09:00
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
Scott Rowe
e2bdaea318 cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
2014-07-23 20:54:50 +00: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
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
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
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
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
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
c9e2716f7b Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 2014-07-23 05:48:23 +00: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
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