Andre Eisenbach
476e81bc0c
am d19094c6: am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4)
...
* commit 'd19094c6ec1cb5640f8d75cef55336e4f6284d90':
LE: Add connection parameter update request API (4/4)
2014-07-18 19:42:50 +00:00
Andre Eisenbach
49ddceef7e
am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4)
...
* commit '92adbade49f741888b69691981e9367aef357b45':
LE: Add connection parameter update request API (4/4)
2014-07-18 19:38:28 +00:00
Christopher Tate
ed1a533360
am 3418a3b8: am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev
...
* commit '3418a3b8f83642459349515554c9cabf7896f4eb':
Tear down agents properly at EOD in full restore
2014-07-18 19:31:15 +00:00
Christopher Tate
4e6d105b0e
am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev
...
* commit '0f5b9306328af0c476bb71eed78e63a65e0898ac':
Tear down agents properly at EOD in full restore
2014-07-18 19:23:09 +00:00
Andre Eisenbach
6ce4db0acf
LE: Add connection parameter update request API (4/4)
...
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
2014-07-18 12:13:46 -07:00
Dan Sandler
9d1ebd82ba
am d97d02e0: am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev
...
* commit 'd97d02e090ee86675b34416e2be0c5a724790db0':
Deprecate and stop generating tickerViews.
2014-07-18 19:05:39 +00:00
Dan Sandler
ca4a8926ef
am f4e77806: am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev
...
* commit 'f4e778064b8bfbba3c5a7411f538c8321460d0a6':
Actually show secret notifications sometimes.
2014-07-18 19:05:34 +00:00
Brian Attwell
ace692ef6d
am 8f17b084: am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev
...
* commit '8f17b084f9d75c33ed2c5a74f755f37d030f9650':
Mark social APIs stream APIs as deprecated
2014-07-18 19:05:29 +00:00
Dan Sandler
cfa9259a62
am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev
...
* commit 'f984501170f7449a38c6785675dd9f460f5bffa4':
Deprecate and stop generating tickerViews.
2014-07-18 18:59:38 +00:00
Dan Sandler
e9381b5e9b
am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev
...
* commit 'e7dc51401bb6a0341c34ccc4b5b04902f0ba997d':
Actually show secret notifications sometimes.
2014-07-18 18:59:31 +00:00
Brian Attwell
a683b2a29c
am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev
...
* commit 'a08e00c7026c6b093fc927a03c168d2ed3b11986':
Mark social APIs stream APIs as deprecated
2014-07-18 18:59:27 +00:00
Narayan Kamath
b8b2b59347
am 7de6bafb: am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev
...
* commit '7de6bafb551e35ff8972be59d62e13b9dafd9263':
Fix broken locale related assumptions in TextServicesManager.
2014-07-18 16:41:35 +00:00
Narayan Kamath
d373c004b0
am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev
...
* commit '3b29a42453c798bbaa8a37ce415cd72ca7b1a2c6':
Fix broken locale related assumptions in TextServicesManager.
2014-07-18 16:38:01 +00:00
Niels Egberts
a2f65f95d6
am 80f946af: am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev
...
* commit '80f946af928fad7f4f66adc99642e7451d1d5865':
New TtsSpan builders for types measure, time, date, digits and verbatim.
2014-07-18 16:03:31 +00:00
Niels Egberts
d66f900acb
am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev
...
* commit '9a35945f774b94abfadff485e6f90de49938c402':
New TtsSpan builders for types measure, time, date, digits and verbatim.
2014-07-18 15:58:42 +00:00
Niels Egberts
0ee4208d40
am ebeaf8bb: am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev
...
* commit 'ebeaf8bb6fd8d30f9c1188dbd5d7e405a133796d':
Add builders for TtsSpans of type ordinal, decimal and fraction.
2014-07-18 15:40:01 +00:00
Niels Egberts
883f961ee0
am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev
...
* commit '50084b07ea1b513a63f236c5e75f66a521f1715e':
Add builders for TtsSpans of type ordinal, decimal and fraction.
2014-07-18 15:33:41 +00:00
Bryan Mawhinney
5afa8111db
am 334595b7: am bd7f8215: am d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev
...
* commit '334595b702e533f142f03b1c091e6d144e7f273c':
Default MediaStyled notifications to CATEGORY_TRANSPORT
2014-07-18 13:13:46 +00:00
Bryan Mawhinney
ce6ee80fa2
am bd7f8215: am d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev
...
* commit 'bd7f8215c9af9c48c4d4bd802d0712a8c0eac66b':
Default MediaStyled notifications to CATEGORY_TRANSPORT
2014-07-18 11:45:13 +00:00
Jae Seo
c2809b7597
am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
...
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
TIF: Add TvParentalControlManager
2014-07-18 03:37:10 +00:00
Jae Seo
353bdd484f
am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
...
* commit 'b719bf5720ea501fa6324d866e49e65b59b1a182':
TIF: Add TvParentalControlManager
2014-07-18 03:30:41 +00:00
Jeff Brown
33003efada
am 843b68d9: am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
...
* commit '843b68d94d3a8d4ad1960c905ad41d5cec4d3ccb':
Add glance sensor for doze mode.
2014-07-18 03:24:03 +00:00
Marcin Kosiba
b04162ab75
am 6ee098ec: am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API.
...
* commit '6ee098ec1ebc15e8816eebd519fbe90c40c7c90d':
Add a WebView.zoomBy API.
2014-07-18 03:18:54 +00:00
Zhijun He
af62909542
am 484bc130: am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
...
* commit '484bc13071781d9401b42043e3ffe277ae512ad3':
Camera2: partialResultCount should be optional
2014-07-18 03:18:50 +00:00
Jeff Brown
e048698b4b
am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
...
* commit '9560a0797de1ce25952c9e8a0b124f49f8cf102e':
Add glance sensor for doze mode.
2014-07-18 03:16:58 +00:00
Marcin Kosiba
64fcb8c3f9
am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API.
...
* commit '8ea71bf3c3e3face48160a1de82b9f2a71616c0b':
Add a WebView.zoomBy API.
2014-07-18 03:09:31 +00:00
Zhijun He
08da81b41b
am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
...
* commit 'fb29d478e9407a6d0dc5b20bb7f2f23ecde4d3da':
Camera2: partialResultCount should be optional
2014-07-18 03:09:25 +00:00
Jinsuk Kim
3a96903be4
am 2fa30b74: am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
...
* commit '2fa30b74b14b07fa83c811da748cf66d48018c4c':
Remove system audio output option for HdmiControlService
2014-07-18 02:57:49 +00:00
Craig Stout
c37905b81f
am 7a400e30: am 79de62b3: am 51ff3b68: Fix timepicker double done buttons.
...
* commit '7a400e3086c33c3c90b188d3ec5e8690be78ce82':
Fix timepicker double done buttons.
2014-07-18 02:57:45 +00:00
Jinsuk Kim
90f54bb704
am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
...
* commit 'eff7b1af6ab496ee64882ad21f1d58269fd37f4a':
Remove system audio output option for HdmiControlService
2014-07-18 02:51:28 +00:00
Craig Stout
abe7b54fb5
am 79de62b3: am 51ff3b68: Fix timepicker double done buttons.
...
* commit '79de62b38cd94629aa09883120becec6faae2229':
Fix timepicker double done buttons.
2014-07-18 02:51:12 +00:00
Marcin Kosiba
3ee06efef3
Add a WebView.zoomBy API.
...
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.
BUG: 13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
2014-07-18 02:18:44 +01:00
Michael Wright
e4da19a9f1
am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
...
* commit 'e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
Add MediaProjection APIs.
2014-07-18 00:32:13 +00:00
Ben Murdoch
3aa88cd61a
am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
...
* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
2014-07-17 23:48:26 +00:00
destradaa
eccc5480a6
am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
...
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
Fix exceptions in ActivityRecognition platform stack.
2014-07-17 23:48:08 +00:00
Andres Morales
f9f7474687
am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition
...
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
Permit settings to "wipe" the persistent partition
2014-07-17 23:47:52 +00:00
Zhijun He
3ddb88ecd3
am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
...
* commit '3bce07590a097d2e904daa549e3083415e3c4051':
Camera2: replace partial quirks with normal partial result
2014-07-17 23:47:45 +00:00
Craig Stout
abdd154334
Fix timepicker double done buttons.
...
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.
Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
2014-07-17 23:28:48 +00:00
Christopher Tate
1787d9c51e
Merge "Tear down agents properly at EOD in full restore" into lmp-dev
2014-07-17 21:58:28 +00:00
Christopher Tate
89101f7fe8
Tear down agents properly at EOD in full restore
...
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.
Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.
Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.
Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
2014-07-17 19:12:09 -07:00
Michael Wright
c7a845de4a
Merge "Add MediaProjection APIs." into lmp-dev
2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7
Add MediaProjection APIs.
...
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.
The screen sharing case is implemented, but all of audio capturing
is still forthcoming.
Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
2014-07-17 14:30:19 -07:00
Zhijun He
d1d2d43fc0
Merge "Camera2: partialResultCount should be optional" into lmp-dev
2014-07-17 21:09:48 +00:00
Zhijun He
1420de4162
Camera2: partialResultCount should be optional
...
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
2014-07-17 17:45:54 -07:00
Jinsuk Kim
fe61a67bb9
Merge "Remove system audio output option for HdmiControlService" into lmp-dev
2014-07-17 21:07:39 +00:00
Eino-Ville Talvala
aff282506f
am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
...
* commit '7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
Add PackageManager features for differentiating camera2 devices
2014-07-17 20:59:30 +00:00
Chris Craik
e7edf9587e
am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev
...
* commit 'deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
Simplify ViewRootImpl's AttachInfo usage
2014-07-17 20:59:17 +00:00
Amith Yamasani
74b5b4005b
am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
...
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
Split telephony restrictions into outgoing calls and sms
2014-07-17 20:59:12 +00:00
Adam Powell
128beccbe5
am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling
...
* commit '35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
Add nested pre-fling for nested scrolling
2014-07-17 20:58:56 +00:00
Ruben Brunk
e5d53bd1ba
am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev
...
* commit 'ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
camera2: Fix swapped Face detection commands.
2014-07-17 20:58:38 +00:00