OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Drag to select text: add some slop for moving between lines" into mnc-dev
Mady Mellor [Wed, 17 Jun 2015 17:36:30 +0000 (17:36 +0000)]
Merge "Drag to select text: add some slop for moving between lines" into mnc-dev

9 years agoMerge "Insertion cursor: add some slop for moving between lines" into mnc-dev
Mady Mellor [Wed, 17 Jun 2015 17:00:08 +0000 (17:00 +0000)]
Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev

9 years agoMerge "Split control background into 40dp and 32dp diameter versions" into mnc-dev
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

9 years agoInsertion cursor: add some slop for moving between lines
Mady Mellor [Fri, 5 Jun 2015 18:12:01 +0000 (11:12 -0700)]
Insertion cursor: add some slop for moving between lines

Applying same method to insertion cursor as the text selection drag
handles to improve moving along lines.

Basically adds some slop above / below the current line and only
allows you to change lines if you move outside of that.

Bug: 21306433
Change-Id: I6c7f3a496fbd1ea66936832f96325736cea872aa

9 years agoDrag to select text: add some slop for moving between lines
Mady Mellor [Wed, 17 Jun 2015 16:46:01 +0000 (09:46 -0700)]
Drag to select text: 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 applies the changes to the drag accelerator.

This CL also makes an adjustment to not apply the finger offset
to the drag accelerator until the user has moved lines, this was
causing an issue where it would immediately include the above line
when initiating the selection.

Bug: 21306433
Bug: 21303943
Change-Id: Id240136493f62524fe6445d8bd65479084fe8126

9 years agoam 93bd8134: am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV...
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

9 years agoMerge "Text selection: add some slop for moving between lines" into mnc-dev
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

9 years agoText selection: add some slop for moving between lines
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

9 years agoam eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to...
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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 16:19:15 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "docs: Updated Android TV landing page and Live TV training to support channels...
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

9 years agoMerge "high-frequency notification stats." into mnc-dev
Chris Wren [Wed, 17 Jun 2015 15:43:39 +0000 (15:43 +0000)]
Merge "high-frequency notification stats." into mnc-dev

9 years agohigh-frequency notification stats.
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

9 years agoam 0752aa54: am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class...
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.

9 years agoam ce26f291: am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create...
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

9 years agoam 474b4775: am d548b29d: Merge "docs: Update JavaDoc ref links for UI training....
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.

9 years agoam 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-previe...
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.

9 years agoam 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps...
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

9 years agoam d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview...
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.

9 years agoMerge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
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

9 years agoMerge "docs: Update JavaDoc reference links for Create Wearable Apps class" into...
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

9 years agoMerge "docs: Update JavaDoc ref links for UI training." 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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:58:39 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:50:56 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:47:01 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Allow QS detail items to get bigger when text is large" into mnc-dev
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

9 years agoMerge "Delete android.speech.srec.*" into mnc-dev
Narayan Kamath [Wed, 17 Jun 2015 11:38:12 +0000 (11:38 +0000)]
Merge "Delete android.speech.srec.*" into mnc-dev

9 years agoZipFileRO: 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

9 years agoMerge "Move distortion correction to correct opcode list." into mnc-dev
Ruben Brunk [Wed, 17 Jun 2015 06:22:23 +0000 (06:22 +0000)]
Merge "Move distortion correction to correct opcode list." into mnc-dev

9 years agoMove distortion correction to correct opcode list.
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

9 years agoFix 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

9 years agoMerge "Finish when browsed root goes away." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:55:34 +0000 (03:55 +0000)]
Merge "Finish when browsed root goes away." into mnc-dev

9 years agoFinish when browsed root goes away.
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

9 years agoMerge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
Yohei Yukawa [Wed, 17 Jun 2015 02:54:06 +0000 (02:54 +0000)]
Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev

9 years agoMerge "Clarification in i10n description for adding a dot to the pattern" into mnc-dev
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

9 years agoClarification in i10n description for adding a dot to the pattern
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

9 years agoam 31217aa5: am e343e673: Merge "Update landing page link to skip the Preview landing...
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

9 years agoam e343e673: Merge "Update landing page link to skip the Preview landing page plus...
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

9 years agoadd creation/update time to WifiConfiguration
Pierre Vandwalle [Tue, 16 Jun 2015 20:55:44 +0000 (13:55 -0700)]
add creation/update time to WifiConfiguration

Change-Id: Iaace83e752c8aa7d740a3dfad42cd8bba80a7a08

9 years agoMerge "Update landing page link to skip the Preview landing page plus copy edit"...
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

9 years agoMerge "Remove hide_carrier_network_settings from Settings." into mnc-dev
Junda Liu [Tue, 16 Jun 2015 23:11:30 +0000 (23:11 +0000)]
Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev

9 years agoMerge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev
Maxim Bogatov [Tue, 16 Jun 2015 22:48:57 +0000 (22:48 +0000)]
Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev

9 years agoMerge "Make sync settings restore more robust" into mnc-dev
Matthew Williams [Tue, 16 Jun 2015 22:36:43 +0000 (22:36 +0000)]
Merge "Make sync settings restore more robust" into mnc-dev

9 years agoMerge "Ensure first load for bitmap and nine-patch gets correct density" 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

9 years agoMerge "Dismiss migration notification when wizard done." 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

9 years agoSplit control background into 40dp and 32dp diameter versions
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

9 years agofix CTS: AccessibilityEndToEndTest failing
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

9 years agoam 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_D...
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

9 years agoMerge "Add keyset support for ECDSA public keys." into mnc-dev
dcashman [Tue, 16 Jun 2015 22:14:33 +0000 (22:14 +0000)]
Merge "Add keyset support for ECDSA public keys." into mnc-dev

9 years agoam 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is...
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

9 years agoEnsure first load for bitmap and nine-patch gets correct density
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

9 years agodocs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required.
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

9 years agoMerge "Make keysetmgrservice gurantees explicit." into mnc-dev
dcashman [Tue, 16 Jun 2015 21:52:56 +0000 (21:52 +0000)]
Merge "Make keysetmgrservice gurantees explicit." into mnc-dev

9 years agoMake sync settings restore more robust
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

9 years agoMerge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-dev
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

9 years agoCEC: Handle <Set Menu Language> message on playback devices
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

9 years agoMerge "Implement channel index masks in AudioDeviceInfo." into mnc-dev
Paul McLean [Tue, 16 Jun 2015 21:41:21 +0000 (21:41 +0000)]
Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev

9 years agoImplement channel index masks in AudioDeviceInfo.
Paul McLean [Mon, 15 Jun 2015 17:19:22 +0000 (10:19 -0700)]
Implement channel index masks in AudioDeviceInfo.

Bug: 21146646
Change-Id: I210f6bb4a4ec0ac0820d1823cffe417141725327

9 years agoam c75034f1: am c7965b02: Merge "docs: Added new "100 days" video to AfW landing...
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

9 years agoDismiss migration notification when wizard done.
Jeff Sharkey [Tue, 16 Jun 2015 20:51:48 +0000 (13:51 -0700)]
Dismiss migration notification when wizard done.

Bug: 21830731
Change-Id: Ief1428cd1ee0885fbc026885e1907f7272810d0f

9 years agoMerge "Fix to only do pre boot receivers on upgrade." into mnc-dev
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

9 years agoMerge "Fully remove Toolbar children when action views expand" 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

9 years agoMerge "Fix crash in ToolbarActionBar when setting null custom view" 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

9 years agoMerge "Add distortion correction opcodes in DngCreator." into mnc-dev
Ruben Brunk [Tue, 16 Jun 2015 20:50:25 +0000 (20:50 +0000)]
Merge "Add distortion correction opcodes in DngCreator." into mnc-dev

9 years agoMerge "Harden KeyInfo." into mnc-dev
Alex Klyubin [Tue, 16 Jun 2015 20:37:57 +0000 (20:37 +0000)]
Merge "Harden KeyInfo." into mnc-dev

9 years agoMerge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev
Eino-Ville Talvala [Tue, 16 Jun 2015 20:37:33 +0000 (20:37 +0000)]
Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev

9 years agoAllow QS detail items to get bigger when text is large
Jason Monk [Tue, 16 Jun 2015 20:01:42 +0000 (16:01 -0400)]
Allow QS detail items to get bigger when text is large

Bug: 19795867
Change-Id: I0fd927c63a363dcfcbb6a99fa9c1dac5c7019d60

9 years agoHarden KeyInfo.
Alex Klyubin [Tue, 16 Jun 2015 20:13:13 +0000 (13:13 -0700)]
Harden KeyInfo.

This ensures that KeyInfo instances are truly immutable.

Bug: 18088752
Change-Id: Ic157d3b928b129a02c3cab9dd20ba9936a005813

9 years agoMerge "Harden and clean up KeyProtection." into mnc-dev
Alex Klyubin [Tue, 16 Jun 2015 19:54:21 +0000 (19:54 +0000)]
Merge "Harden and clean up KeyProtection." into mnc-dev

9 years agoHarden and clean up KeyProtection.
Alex Klyubin [Tue, 16 Jun 2015 19:31:34 +0000 (12:31 -0700)]
Harden and clean up KeyProtection.

This ensures that instances of this class are immutable and cleans up
some flawed logic discovered when writing up CTS tests.

Bug: 18088752
Change-Id: If9cc33192ada5a8982a2b200ab24cb18331cf958

9 years agoMerge "Harden and clean up KeyGenParameterSpec." into mnc-dev
Alex Klyubin [Tue, 16 Jun 2015 19:11:57 +0000 (19:11 +0000)]
Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev

9 years agoHarden and clean up KeyGenParameterSpec.
Alex Klyubin [Tue, 16 Jun 2015 16:51:20 +0000 (09:51 -0700)]
Harden and clean up KeyGenParameterSpec.

This ensures that instances of this class are immutable and cleans up
some flawed logic discovered when writing up CTS tests.

Bug: 18088752
Change-Id: I7a27dbfc3445599bccabbd26e39535ce988a2ab2

9 years agoCamera: Adjust intrinsic transform coordinate system.
Eino-Ville Talvala [Tue, 16 Jun 2015 18:44:10 +0000 (11:44 -0700)]
Camera: Adjust intrinsic transform coordinate system.

Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0

9 years agoDelete android.speech.srec.*
Narayan Kamath [Tue, 16 Jun 2015 18:39:18 +0000 (19:39 +0100)]
Delete android.speech.srec.*

This code had an undeclared dependency on libsrec_jni which
we no longer build.

bug: 21855957
Change-Id: Ie00645960b18aaa2a7d944a2ad31ff57e0b0b2ba

9 years agodocs: Updated Android TV landing page and Live TV training to support channels.
Quddus Chong [Fri, 12 Jun 2015 18:29:12 +0000 (11:29 -0700)]
docs: Updated Android TV landing page and Live TV training to support channels.
bug: 21786387

Change-Id: I343e00d30d25f46a9081af339ee4c4a2fddba149

9 years agoMerge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
Rubin Xu [Tue, 16 Jun 2015 18:15:27 +0000 (18:15 +0000)]
Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev

9 years agoam c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc...
Andrew Solovay [Tue, 16 Jun 2015 17:57:03 +0000 (17:57 +0000)]
am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs

* commit 'c7965b024d660b62e5500e4bb8a3f942960dddf1':
  docs: Added new "100 days" video to AfW landing page

9 years agoMerge "disable verbose logs from people notifications." into mnc-dev
Chris Wren [Tue, 16 Jun 2015 17:54:10 +0000 (17:54 +0000)]
Merge "disable verbose logs from people notifications." into mnc-dev

9 years agoFix to only do pre boot receivers on upgrade.
Dianne Hackborn [Tue, 16 Jun 2015 17:50:06 +0000 (10:50 -0700)]
Fix to only do pre boot receivers on upgrade.

I mistakenly checked in a change that forced us to run
pre boot receivers during every boot, which was intended to
just be temporary for testing.

Change-Id: I7890432f2d42deccef934c1503c3af4b55f59494

9 years agoMerge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs
Andrew Solovay [Tue, 16 Jun 2015 17:48:44 +0000 (17:48 +0000)]
Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs

9 years agoMerge "Improved zipping logic so it zips chunks, instead of the whole file at once...
Felipe Leme [Tue, 16 Jun 2015 17:37:46 +0000 (17:37 +0000)]
Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev

9 years agoMerge "Fix null deref" into mnc-dev
John Reck [Tue, 16 Jun 2015 17:34:27 +0000 (17:34 +0000)]
Merge "Fix null deref" into mnc-dev

9 years agoImproved zipping logic so it zips chunks, instead of the whole file at once, to avoid...
Felipe Leme [Tue, 16 Jun 2015 17:25:06 +0000 (10:25 -0700)]
Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.

BUG: 20447313
Change-Id: I66f90cdd2a07288f9e37a38185f1583c57cf65c8

9 years agoFix null deref
John Reck [Tue, 16 Jun 2015 17:29:31 +0000 (10:29 -0700)]
Fix null deref

Bug: 21857172

willHaveFunctor was assuming that either mStagingDisplayList
or mDisplayList would be non-null but this isn't true. Both
can be null in some scenarios (notably after a trimMemory)

Change-Id: Ia2915b84cfc907ec9c7cbec54ed6dc26283ec998

9 years agoMerge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
Fyodor Kupolov [Tue, 16 Jun 2015 17:14:58 +0000 (17:14 +0000)]
Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev

9 years agoMerge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev
Felipe Leme [Tue, 16 Jun 2015 16:59:47 +0000 (16:59 +0000)]
Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev

9 years agoMerge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
Chirag Shah [Tue, 16 Jun 2015 16:54:00 +0000 (16:54 +0000)]
Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev

9 years agoMerge "Add ic_dialog_alert_material to symbols" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Add ic_dialog_alert_material to symbols" into mnc-dev

9 years agoAdd distortion correction opcodes in DngCreator.
Ruben Brunk [Sat, 6 Jun 2015 00:03:49 +0000 (17:03 -0700)]
Add distortion correction opcodes in DngCreator.

Bug: 20491394

Change-Id: Ic85470cbb1cd121db9fb9c37f012fbf9dba1a8cb

9 years agoMerge "Fix issue #21816660 (app standby), work on issue #20882522 (voice interact...
Dianne Hackborn [Tue, 16 Jun 2015 16:40:57 +0000 (16:40 +0000)]
Merge "Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)" into mnc-dev

9 years agoChanged BugReportReceiver to send zipped bugreports.
Felipe Leme [Mon, 1 Jun 2015 19:21:46 +0000 (12:21 -0700)]
Changed BugReportReceiver to send zipped bugreports.

When BugReporterReceiver receives a android.permission.DUMP, it will handle the bugreport file (extra android.intent.extra.BUGREPORT) depending on its format:

 - If it's a plain-text file (extension .txt), it will create a zip file with the plain-text report renamed as bugreport.txt.
 - If there is an error creating the zip file, the plain-text bugreport will be sent instead.
 - If it's not a plain-text file, it fill send the file as is (so if 'dumpstate' is later changed to generate a zipped file directly, nothing has to be done here).

Note that only the bugreport itself is included in the zip file, the screenshot is still sent separately (extra android.intent.extra.SCREENSHOT), so the receiver of the bugreport intent can display a screenshot thumbnail without unzipping the other file (which is useful when sending the bugreport through GMail, for example).

BUG: 20447313
BUG: 21868658
Change-Id: I3fa1e0c89190bfe6fa5c418f0f01ce1fb376f537

9 years agoMerge "Fix floating toolbar flickers." into mnc-dev
Abodunrinwa Toki [Tue, 16 Jun 2015 15:54:24 +0000 (15:54 +0000)]
Merge "Fix floating toolbar flickers." into mnc-dev

9 years agoMerge "Have the final setVisibility cause a requestLayout." into mnc-dev
George Mount [Tue, 16 Jun 2015 15:27:25 +0000 (15:27 +0000)]
Merge "Have the final setVisibility cause a requestLayout." into mnc-dev

9 years agoAdd ic_dialog_alert_material to symbols
Jason Monk [Tue, 16 Jun 2015 15:26:00 +0000 (11:26 -0400)]
Add ic_dialog_alert_material to symbols

Bug: 20751702
Change-Id: I43f8a6020968ffb7ea6e07061258efeb395a3c91

9 years agodisable verbose logs from people notifications.
Chris Wren [Tue, 16 Jun 2015 15:23:12 +0000 (11:23 -0400)]
disable verbose logs from people notifications.

Bug: 20258744
Change-Id: Ifa3fb4f6aefaab4d6c669b1e60f8536515725c0f

9 years agoFix floating toolbar flickers.
Abodunrinwa Toki [Tue, 16 Jun 2015 14:47:04 +0000 (15:47 +0100)]
Fix floating toolbar flickers.

-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.

-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.

Bug: 21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0