Commit Graph

42773 Commits

Author SHA1 Message Date
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Andre Eisenbach
b3db5eb4f0 Merge "Reduce GATT logging output" into lmp-dev 2014-07-18 18:24:25 +00:00
Andre Eisenbach
55d19e495e Reduce GATT logging output
Change-Id: Iefdf101ac849e45bf50c55ce5999364f5fbd24a4
2014-07-18 14:38:36 -07: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
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
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
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
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
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
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
Neil Fuller
fc6346d461 Merge "Rewriting android.text.format.Time without the native _tz functions" 2014-07-17 22:36:58 +00:00
Neil Fuller
d7f0849b8c Rewriting android.text.format.Time without the native _tz functions
Bug: 15765976
Change-Id: I666b72ecf9da8a9dcfb97cc503006b415909a558
2014-07-22 15:06:16 +01:00
Narayan Kamath
e242111c5d Merge "Remove copy of Locale.adjustLanguageCode." 2014-07-17 22:36:58 +00:00
Narayan Kamath
1d31a5f824 Remove copy of Locale.adjustLanguageCode.
Change-Id: Iba8c67890f95d50fadcd1245dc083d646fe6bcc1
2014-07-18 16:09:36 +01:00
Chris Craik
f251bde890 Merge "Tweaks to outline API" into lmp-dev 2014-07-17 21:58:28 +00:00
Chris Craik
31ba192dd2 Tweaks to outline API
b/15283203
b/16142564

Remove boolean return value chaining, as it's redundant with
the data in the Outline itself.

Change-Id: I3116e57cd1b35c98b74e95195117edd7e39fb2df
2014-07-19 00:13:59 +00:00
Adam Powell
b7fae17a03 Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 2014-07-17 21:58:28 +00:00
Adam Powell
e49d939378 Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
This allows the calling app to supply a set of alternative extras to
be sent along with the target intent if the user chooses specific
items from the full set available on the device. When replacement
extras have the same key as extras in the initial intent, the
replacement extras dominate.

Change-Id: I5d64c80447386f22402b71291bb289a74015d619
2014-07-18 16:27:11 -07:00
Sreeram Ramachandran
64126bc3c3 Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 2014-07-17 21:58:28 +00:00
Sreeram Ramachandran
cc26b4cc09 Allow VPN interfaces to be put into blocking mode.
New API with stub implementation to be filled out later.

Bug: 12879610
Change-Id: Iff711994dec4598c74fe11447c8c670004c1188c
2014-07-18 16:46:13 -07:00
Winson Chung
57eea0f788 Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Jason Monk
56e09b42a0 Add setting to guard the lock-to-app recents icon
Lock-to-app (soon to be screen-pinning) will now only show up once
it has been enabled in settings.

Bug: 16378448
Change-Id: Ide333463f86310eacb7a1d8b6dc7b1aea8722713
2014-07-18 16:45:34 -07:00
Jim Miller
06e345089a Add DevicePolicyManager flag for fingerprint.
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
2014-07-18 20:48:34 +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
Yohei Yukawa
ad8f1673f6 Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 2014-07-17 21:15:46 +00:00
Yohei Yukawa
ff328ae743 Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
This CL adds an initial support of
CursorAnchorInfoRequest#FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE for
TextView.

This implementation is not highly optimized yet, but it just
works as it should.

BUG: 16379288
Change-Id: Iecb32b4c4dcd7db14d8b2a0d929e1d64e161bc58
2014-07-19 12:59:52 +09: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
Amith Yamasani
6bce0f739b Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 2014-07-17 21:09:48 +00:00
Amith Yamasani
570002ffd4 Add a hidden API to expose cross profile caller id check
To be used by telephony/contacts.

Change-Id: If8e06c20a708ce5e8f7d717d8758c19a78efa46d
2014-07-18 22:51:04 +00: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
Jungshik Jang
a6b2a7a59a Add two apis for one touch record.
This change introduces new two apis for one touch record.
1. setRecordRequestListener
 It's used to get notified when a recorder device initiates
 "one touch record". As return of callback, client should
 generate "record source" and return it.
2. startRecord
 It's used to initiate "one touch record" from Tv.

Along with this, add HdmiRecordSources which is a helper
class assisting buidling byte array form from the given
record source information.

Bug: 16160962

Change-Id: I403d37b752c9b7f799c6d8188a071ef420fe8ac2
2014-07-21 16:54:53 +09: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