OSDN Git Service
Alan Viverette [Wed, 17 Jun 2015 17:00:33 +0000 (17:00 +0000)]
am
8d537051: Merge "Split control background into 40dp and 32dp diameter versions" into mnc-dev
* commit '
8d537051c12d345974bf441bebc58afb1fd64ad7':
Split control background into 40dp and 32dp diameter versions
Alan Viverette [Wed, 17 Jun 2015 16:50:25 +0000 (16:50 +0000)]
Merge "Split control background into 40dp and 32dp diameter versions" into mnc-dev
Quddus Chong [Wed, 17 Jun 2015 16:41:36 +0000 (16:41 +0000)]
am
5c7b9495: am
93bd8134: am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
5c7b9495fbf95a87c6dd85bdbd170aa35483f004':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Mady Mellor [Wed, 17 Jun 2015 16:41:32 +0000 (16:41 +0000)]
am
13e54ff0: Merge "Text selection: add some slop for moving between lines" into mnc-dev
* commit '
13e54ff0ebc5fe6f425c16d9d30ea9ecd5db1348':
Text selection: add some slop for moving between lines
Quddus Chong [Wed, 17 Jun 2015 16:36:17 +0000 (16:36 +0000)]
am
93bd8134: am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
93bd81346de88f850f4e4002229a3119c97d8ddb':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Mady Mellor [Wed, 17 Jun 2015 16:30:16 +0000 (16:30 +0000)]
Merge "Text selection: add some slop for moving between lines" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 16:30:00 +0000 (16:30 +0000)]
am
71e5d535: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
71e5d535a8d93621034d9d4df354a09039ac07d1':
Import translations. DO NOT MERGE
Mady Mellor [Wed, 17 Jun 2015 16:25:19 +0000 (09:25 -0700)]
Text selection: add some slop for moving between lines
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line.
This CL also makes a small modification to check if the layout is
null and return early which simplifies some of the following code.
Bug:
21306433
Change-Id: I4a854e644faafaf1e159201ae1f2838862f16b25
Quddus Chong [Wed, 17 Jun 2015 16:23:38 +0000 (16:23 +0000)]
am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
eae09b4a642bb30d5fd8ff90796e410197d71c95':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Geoff Mendal [Wed, 17 Jun 2015 16:19:15 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 16:14:37 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ac364b0a987a0546be8c0c9b606ee7ad85a7320
Auto-generated-cl: translation import
Quddus Chong [Wed, 17 Jun 2015 16:13:19 +0000 (16:13 +0000)]
Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
Chris Wren [Wed, 17 Jun 2015 15:53:34 +0000 (15:53 +0000)]
am
3d2b6212: Merge "high-frequency notification stats." into mnc-dev
* commit '
3d2b621204bf74eb0adf548ae1c8850a05aea01a':
high-frequency notification stats.
Chris Wren [Wed, 17 Jun 2015 15:43:39 +0000 (15:43 +0000)]
Merge "high-frequency notification stats." into mnc-dev
Chris Wren [Tue, 16 Jun 2015 17:56:22 +0000 (13:56 -0400)]
high-frequency notification stats.
Aggregate and then periodically report stats that are high-frequency
because they are driven by app behavior, not user behavior.
Reuse the NotificationUsageStats facility.
Remove redundant stats.
Lessen memory foot print.
Enable in-memeory aggregates with small, bounded memory footprint.
Bug:
20258744
Change-Id: I87e391419c53917fa13c68a56f8cdb40a7c8e548
Luan Nguyen [Wed, 17 Jun 2015 15:27:29 +0000 (15:27 +0000)]
am
e5884808: am
0752aa54: am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
e58848086a0e94182e1572d0bde3f0afa1cf7a4b':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:27:24 +0000 (15:27 +0000)]
am
1824ea1b: am
ce26f291: am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
1824ea1b1c60f27cbc49ed086cd6198641f6c74f':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:27:19 +0000 (15:27 +0000)]
am
871c5cb5: am
474b4775: am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
871c5cb52ddefa15296e4e59c592bef0abf297f9':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 15:14:32 +0000 (15:14 +0000)]
am
0752aa54: am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
0752aa54a03b39e2a16e6f40e4d7cf912a29bd08':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:14:27 +0000 (15:14 +0000)]
am
ce26f291: am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
ce26f2911361fe1da9d3f350e2785657d6d5e685':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:14:22 +0000 (15:14 +0000)]
am
474b4775: am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
474b4775edb0154ad8f5b85a53fb2c689de69b40':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 15:03:04 +0000 (15:03 +0000)]
am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
5cef09b07521cf14eb6a9c9dc59276b9b6482bef':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:02:59 +0000 (15:02 +0000)]
am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
5980ae8f06d5a56a5bfc763729533d975079b801':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:02:55 +0000 (15:02 +0000)]
am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
d548b29def4006c0a19df090189198e51715bccd':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 14:55:43 +0000 (14:55 +0000)]
Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 14:54:49 +0000 (14:54 +0000)]
Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 14:54:27 +0000 (14:54 +0000)]
Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
Geoff Mendal [Wed, 17 Jun 2015 14:10:51 +0000 (14:10 +0000)]
am
641234c1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
641234c172ad72c332bca61fe9f73f8ad1fd8227':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 13:59:21 +0000 (13:59 +0000)]
am
63534a9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
63534a9d1083dedeab2d20919de94df6f1cd4e21':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 13:59:17 +0000 (13:59 +0000)]
am
e21d5648: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e21d56482fa47de13a098badba449ef7e90e31b4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 13:58:39 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:58:03 +0000 (08:58 -0500)]
Import translations. DO NOT MERGE
Change-Id: If7f177f95be4ab365cf62a8dc080373a7ae0e27b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Jun 2015 13:50:56 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:50:03 +0000 (08:50 -0500)]
Import translations. DO NOT MERGE
Change-Id: I47235b1d4bd87bf37da15e687b3f5cbfc5f4c0b4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Jun 2015 13:47:01 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:45:37 +0000 (08:45 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie78d85789becd82c6fd468d50a47516711e5715a
Auto-generated-cl: translation import
Jason Monk [Wed, 17 Jun 2015 13:09:22 +0000 (13:09 +0000)]
am
f858f703: Merge "Allow QS detail items to get bigger when text is large" into mnc-dev
* commit '
f858f7034c911c1a4dc45daa6e80ee0f9925e008':
Allow QS detail items to get bigger when text is large
Jason Monk [Wed, 17 Jun 2015 13:02:20 +0000 (13:02 +0000)]
Merge "Allow QS detail items to get bigger when text is large" into mnc-dev
Narayan Kamath [Wed, 17 Jun 2015 11:53:56 +0000 (11:53 +0000)]
am
2c89e7d8: Merge "Delete android.speech.srec.*" into mnc-dev
* commit '
2c89e7d8dba1713de17157a164071c65f4b00915':
Delete android.speech.srec.*
Narayan Kamath [Wed, 17 Jun 2015 11:38:12 +0000 (11:38 +0000)]
Merge "Delete android.speech.srec.*" into mnc-dev
Narayan Kamath [Wed, 17 Jun 2015 09:51:23 +0000 (09:51 +0000)]
am
4600dd05: ZipFileRO: Use precise widths for zip file types.
* commit '
4600dd053dbdbd4b95f3b11057a1cc55b99f9c77':
ZipFileRO: Use precise widths for zip file types.
Narayan Kamath [Tue, 16 Jun 2015 11:02:57 +0000 (12:02 +0100)]
ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.
This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.
Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".
bug:
21622286
Change-Id: Iae675a9601db7aae03a8b80b40321d2cc1d97f50
Ruben Brunk [Wed, 17 Jun 2015 06:33:01 +0000 (06:33 +0000)]
am
5e063b1d: Merge "Move distortion correction to correct opcode list." into mnc-dev
* commit '
5e063b1da52cca1b93b19bdf7be694aabf95d336':
Move distortion correction to correct opcode list.
Ruben Brunk [Wed, 17 Jun 2015 06:22:23 +0000 (06:22 +0000)]
Merge "Move distortion correction to correct opcode list." into mnc-dev
Ruben Brunk [Wed, 17 Jun 2015 06:03:09 +0000 (23:03 -0700)]
Move distortion correction to correct opcode list.
- Prior to this, the lens distortion correction was applying
resampling to the bayer mosaic, resulting in magenta
output images (oops).
Bug:
20491394
Change-Id: Ia244364954062d1c38ef3ec3b7a1d087904112f9
Yohei Yukawa [Wed, 17 Jun 2015 04:30:16 +0000 (04:30 +0000)]
am
f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
* commit '
f4d225a4b502ef227788447eb1a5bb2902019c01':
Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
Yohei Yukawa [Wed, 17 Jun 2015 04:19:00 +0000 (21:19 -0700)]
Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
This is a follow up CL for Ifd05565ac0c057c46ec88a3fb9094c04934041d.
SpellCheckerSessionListenerImpl.taskToString(TASK_CANCEL) has
somehow returned "STATE_WAIT_CONNECTION" probably because of
a copy-and-paste mistake.
With this CL, it now returns "TASK_CANCEL", which is observable
only in debug log anyway though.
Bug:
21319642
Change-Id: Ib0bf11494bd3f210e6e8192fc25a33c65f7d313d
Jeff Sharkey [Wed, 17 Jun 2015 04:08:17 +0000 (04:08 +0000)]
am
3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev
* commit '
3d00f7a1be6ff858a89e2220f33231ecb3570ef3':
Finish when browsed root goes away.
Jeff Sharkey [Wed, 17 Jun 2015 03:55:34 +0000 (03:55 +0000)]
Merge "Finish when browsed root goes away." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:54:11 +0000 (20:54 -0700)]
Finish when browsed root goes away.
If we're browsing a specific root, and that root went away, typically
due to formatting.
Bug:
21831184
Change-Id: Ie07607a81e32a7d82c88ad382658a471d47b905d
Yohei Yukawa [Wed, 17 Jun 2015 03:02:32 +0000 (03:02 +0000)]
am
e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
* commit '
e34f0984bb879cb7c89b8ff5a78e4bc7243c6331':
Fix a reference leak in SpellCheckerSessionListenerImpl.
Yohei Yukawa [Wed, 17 Jun 2015 02:54:06 +0000 (02:54 +0000)]
Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
Jim Miller [Wed, 17 Jun 2015 00:52:52 +0000 (00:52 +0000)]
am
42376d64: Merge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev
* commit '
42376d6482804ac240fc84a75e50e7fae478b744':
Clarification in i10n description for adding a dot to the pattern
Jim Miller [Wed, 17 Jun 2015 00:40:57 +0000 (00:40 +0000)]
Merge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev
Jim Miller [Wed, 17 Jun 2015 00:39:04 +0000 (17:39 -0700)]
Clarification in i10n description for adding a dot to the pattern
Fixes bug
21865115
Change-Id: I093336d3e70dba5143af153aa3cb727ce33471a4
Joe Fernandez [Wed, 17 Jun 2015 00:28:01 +0000 (00:28 +0000)]
am
b93205a0: am
31217aa5: am
e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
* commit '
b93205a0df921521828ce1ea1798c57585fa1226':
Update landing page link to skip the Preview landing page plus copy edit
Joe Fernandez [Wed, 17 Jun 2015 00:15:42 +0000 (00:15 +0000)]
am
31217aa5: am
e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
* commit '
31217aa591e4f0acc5937d51a2455c36b44da7e2':
Update landing page link to skip the Preview landing page plus copy edit
Pierre Vandwalle [Wed, 17 Jun 2015 00:09:56 +0000 (00:09 +0000)]
am
ced1a659: add creation/update time to WifiConfiguration
* commit '
ced1a6599042826a3bf678871d6b8a9e7187e973':
add creation/update time to WifiConfiguration
Joe Fernandez [Wed, 17 Jun 2015 00:01:57 +0000 (00:01 +0000)]
am
e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
* commit '
e343e673eca0c0e3b943ce7ddd27b37e29a873f4':
Update landing page link to skip the Preview landing page plus copy edit
Pierre Vandwalle [Tue, 16 Jun 2015 20:55:44 +0000 (13:55 -0700)]
add creation/update time to WifiConfiguration
Change-Id: Iaace83e752c8aa7d740a3dfad42cd8bba80a7a08
Joe Fernandez [Tue, 16 Jun 2015 23:54:32 +0000 (23:54 +0000)]
Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
Junda Liu [Tue, 16 Jun 2015 23:18:50 +0000 (23:18 +0000)]
am
a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
* commit '
a11ffa64366e39899bcda7448e5b5ffe727bea48':
Remove hide_carrier_network_settings from Settings.
Junda Liu [Tue, 16 Jun 2015 23:11:30 +0000 (23:11 +0000)]
Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
Maxim Bogatov [Tue, 16 Jun 2015 23:01:04 +0000 (23:01 +0000)]
am
e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev
* commit '
e6ba94ce022a60b5225ee54cf2cc710633441d87':
fix CTS: AccessibilityEndToEndTest failing
Maxim Bogatov [Tue, 16 Jun 2015 22:48:57 +0000 (22:48 +0000)]
Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev
Matthew Williams [Tue, 16 Jun 2015 22:42:38 +0000 (22:42 +0000)]
am
15ce3387: Merge "Make sync settings restore more robust" into mnc-dev
* commit '
15ce33873e2ca774a1fca666a05cc8ed79f327d7':
Make sync settings restore more robust
Alan Viverette [Tue, 16 Jun 2015 22:42:33 +0000 (22:42 +0000)]
am
469b5da8: Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev
* commit '
469b5da8837a7fa93fc38a16e5e590e9dc2fbdf8':
Ensure first load for bitmap and nine-patch gets correct density
Jeff Sharkey [Tue, 16 Jun 2015 22:42:26 +0000 (22:42 +0000)]
am
fd047570: Merge "Dismiss migration notification when wizard done." into mnc-dev
* commit '
fd0475702b6be5930eb8b6633ea877e06392044f':
Dismiss migration notification when wizard done.
Matthew Williams [Tue, 16 Jun 2015 22:36:43 +0000 (22:36 +0000)]
Merge "Make sync settings restore more robust" into mnc-dev
Alan Viverette [Tue, 16 Jun 2015 22:33:23 +0000 (22:33 +0000)]
Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:31:27 +0000 (22:31 +0000)]
Merge "Dismiss migration notification when wizard done." into mnc-dev
Quddus Chong [Tue, 16 Jun 2015 22:22:26 +0000 (22:22 +0000)]
am
2ce8daac: am
83ee59d5: am
375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
* commit '
2ce8daacac91f4ea8da3f8c6c08c8242a0316310':
docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
dcashman [Tue, 16 Jun 2015 22:22:22 +0000 (22:22 +0000)]
am
acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev
* commit '
acc2df21de9da66d8aaf9bf2b733f8b284454403':
Add keyset support for ECDSA public keys.
Alan Viverette [Tue, 16 Jun 2015 22:20:00 +0000 (15:20 -0700)]
Split control background into 40dp and 32dp diameter versions
Uses 32dp for seek bar.
Bug:
21848490
Change-Id: Ib1549f5217413f49f7e84aaeb12476b9315f9994
Maxim Bogatov [Tue, 16 Jun 2015 22:15:49 +0000 (15:15 -0700)]
fix CTS: AccessibilityEndToEndTest failing
ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes
b/
21369265
Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac
Quddus Chong [Tue, 16 Jun 2015 22:15:15 +0000 (22:15 +0000)]
am
83ee59d5: am
375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
* commit '
83ee59d5de365669cd7a9d8bfa552a90678d0587':
docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
dcashman [Tue, 16 Jun 2015 22:14:33 +0000 (22:14 +0000)]
Merge "Add keyset support for ECDSA public keys." into mnc-dev
Quddus Chong [Tue, 16 Jun 2015 22:05:54 +0000 (22:05 +0000)]
am
375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
* commit '
375ad9e1ebc327b87f378f1e0d3cf12f058e5f36':
docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
Alan Viverette [Tue, 16 Jun 2015 22:04:45 +0000 (15:04 -0700)]
Ensure first load for bitmap and nine-patch gets correct density
Remove unnecessary lines setting target density on bitmap and nine patch,
since we'll do this later in inflate().
Bug:
21774853
Change-Id: I5ea316bee81f82192ce20f2f1bee0e62c6ec8ccb
dcashman [Tue, 16 Jun 2015 21:59:18 +0000 (21:59 +0000)]
am
2f902959: Merge "Make keysetmgrservice gurantees explicit." into mnc-dev
* commit '
2f902959245f1cae57827025b8711a059faaf782':
Make keysetmgrservice gurantees explicit.
Jinsuk Kim [Tue, 16 Jun 2015 21:59:14 +0000 (21:59 +0000)]
am
52ca0207: Merge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-dev
* commit '
52ca020722e8db42f9240de6959567d734f3ac6f':
CEC: Handle <Set Menu Language> message on playback devices
Quddus Chong [Tue, 16 Jun 2015 21:38:52 +0000 (14:38 -0700)]
docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required.
bug:
21400628
Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d
dcashman [Tue, 16 Jun 2015 21:52:56 +0000 (21:52 +0000)]
Merge "Make keysetmgrservice gurantees explicit." into mnc-dev
Paul McLean [Tue, 16 Jun 2015 21:49:54 +0000 (21:49 +0000)]
am
8ff232c7: Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev
* commit '
8ff232c7be5e075b6b0e10b8f40b556c97b79651':
Implement channel index masks in AudioDeviceInfo.
Andrew Solovay [Tue, 16 Jun 2015 21:49:50 +0000 (21:49 +0000)]
am
b259a903: am
c75034f1: am
c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs
* commit '
b259a9036bab78222ea72f45b909d76361da4783':
docs: Added new "100 days" video to AfW landing page
Dianne Hackborn [Tue, 16 Jun 2015 21:49:46 +0000 (21:49 +0000)]
am
f4c936a7: Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev
* commit '
f4c936a7e627fa2a11ebfaa2614a76f3c69a4756':
Fix to only do pre boot receivers on upgrade.
Adam Powell [Tue, 16 Jun 2015 21:49:41 +0000 (21:49 +0000)]
am
8edfe18c: Merge "Fully remove Toolbar children when action views expand" into mnc-dev
* commit '
8edfe18c193e2d6d719b2e141628f33b669598d9':
Fully remove Toolbar children when action views expand
Adam Powell [Tue, 16 Jun 2015 21:49:37 +0000 (21:49 +0000)]
am
26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev
* commit '
26b27cab811e2c91b6e229cf5bfcf5846fb6d094':
Fix crash in ToolbarActionBar when setting null custom view
Matthew Williams [Thu, 11 Jun 2015 03:06:37 +0000 (20:06 -0700)]
Make sync settings restore more robust
Bug:
18506992
Parent Bug:
17967106
Introduce a new state for ContentResolver#getIsSyncable.
This state specifies that an adapter should be disabled until
explicitly turned on by ContentResolver#setSyncAutomatically(true).
In this way we can restore disabled sync adapters and still allow
them to run their initialization logic later on when they are
re-enabled.
Change-Id: I03fd1f994c4bc982bbc723154ba20bb252efdf80
Jinsuk Kim [Tue, 16 Jun 2015 21:44:59 +0000 (21:44 +0000)]
Merge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-dev
Terry Heo [Wed, 1 Oct 2014 06:03:53 +0000 (15:03 +0900)]
CEC: Handle <Set Menu Language> message on playback devices
Bug:
16819131, Bug:
21505123
Change-Id: I3dc6439c13c2ebe5591d9e27c0c86419ed440f9b
Paul McLean [Tue, 16 Jun 2015 21:41:21 +0000 (21:41 +0000)]
Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev
Paul McLean [Mon, 15 Jun 2015 17:19:22 +0000 (10:19 -0700)]
Implement channel index masks in AudioDeviceInfo.
Bug:
21146646
Change-Id: I210f6bb4a4ec0ac0820d1823cffe417141725327
Andrew Solovay [Tue, 16 Jun 2015 21:37:23 +0000 (21:37 +0000)]
am
c75034f1: am
c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs
* commit '
c75034f1e40719aeec3e703d51414ac05fe2ca98':
docs: Added new "100 days" video to AfW landing page
Jeff Sharkey [Tue, 16 Jun 2015 20:51:48 +0000 (13:51 -0700)]
Dismiss migration notification when wizard done.
Bug:
21830731
Change-Id: Ief1428cd1ee0885fbc026885e1907f7272810d0f
Dianne Hackborn [Tue, 16 Jun 2015 21:34:25 +0000 (21:34 +0000)]
Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev
Adam Powell [Tue, 16 Jun 2015 21:30:11 +0000 (21:30 +0000)]
Merge "Fully remove Toolbar children when action views expand" into mnc-dev
Adam Powell [Tue, 16 Jun 2015 21:29:46 +0000 (21:29 +0000)]
Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev
Ruben Brunk [Tue, 16 Jun 2015 21:08:02 +0000 (21:08 +0000)]
am
1c52669d: Merge "Add distortion correction opcodes in DngCreator." into mnc-dev
* commit '
1c52669d1f35e11feaad52a65507a9c4f1f4c876':
Add distortion correction opcodes in DngCreator.
Ruben Brunk [Tue, 16 Jun 2015 20:50:25 +0000 (20:50 +0000)]
Merge "Add distortion correction opcodes in DngCreator." into mnc-dev
OSDN Git Service
