Commit Graph

49267 Commits

Author SHA1 Message Date
Mike Lockwood
90b9a6a4ab MidiManager API tweaks:
Rename MidiReceiver.onPost() to post()

Change MidiManager.DeviceCallback from an interface to a class

Change-Id: I939ba7a7d82e721b90a3d80252a88e7a650c9396
2015-02-12 10:58:52 -08:00
Alan Viverette
ea54c0f97c Merge "Make popup transition animation play nicely with dismiss/show pair" 2015-02-03 00:12:32 +00:00
Brian Attwell
3398442905 Merge "Expose QUERY_PARAMETER_VCARD_NO_PHOTO" 2015-02-02 21:34:34 +00:00
Brian Attwell
f9fb60a592 Expose QUERY_PARAMETER_VCARD_NO_PHOTO
QUERY_PARAMETER_VCARD_NO_PHOTO is used to avoid
attaching photos on vcards that get sent over NFC.
Large VCards can't be easily sent over NFC.

I'm deferring writing CTS tests till later.

Bug: 18777272
Change-Id: I6e3a7bf836978023225c709446b9113de05f6cef
2015-02-02 13:33:53 -08:00
Scott Kennedy
144ea46ce1 Merge "Add some @Nullable annotations to SharedPreferences" 2015-02-02 20:38:10 +00:00
Alan Viverette
e025ed2f26 Make popup transition animation play nicely with dismiss/show pair
Previously it was okay to call dismiss/show in quick succession since
the window was removed synchronously. Adding transitions introduced a
delay between dismiss() and actually removing the window, which broke
this behavior.

Change-Id: I0de8ae0a551dcb2eb8b8a50356c308b654ebdc6f
2015-02-02 11:27:21 -08:00
Brian Attwell
462c9f50c3 Remove NAME_VERIFIED. Part 4
Bug: 18777272
Change-Id: I1579a3122b2d45b80de7106a2b9616e323855045
2015-02-02 18:41:27 +00:00
Julia Reynolds
a9ec70ba17 Add skip encryption constants for device owner provisioning.
Bug: 19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
2015-02-02 12:42:18 -05:00
Marcin Kosiba
d26b16cbdf Merge "Update docs to say onPageStarted is not called for fragment navigations." 2015-02-02 10:22:43 +00:00
Marcin Kosiba
3a1f4bfda6 Merge "Update docs for WebResourceRequest.hasUserGesture." 2015-02-02 10:22:17 +00:00
Alan Viverette
e426f3b0b2 Merge "Use inherited visibility to set visibility of managed drawables" 2015-01-31 00:21:47 +00:00
Alan Viverette
96ccd39d35 Use inherited visibility to set visibility of managed drawables
Previously we only used direct visibility, which resulted in strange
behavior when a parent view with an animated child was hidden. We were
also incorrectly awakening scroll bars for non-visible views, though
that's a much less visible (pun intended) bug.

Only handles the two most common cases for ripples. A subsequent CL will
update handling of View drawable management and fix this for all managed
drawables.

Bug: 15350931
Change-Id: I0d0fe2c51210e8d2e0a73b0248cec3b93bfc36f5
2015-01-30 15:55:48 -08:00
Scott Kennedy
2333e3406c Add some @Nullable annotations to SharedPreferences
Change-Id: I26e7a02a18d802902fca6892bed77b4f98ccf3ee
2015-01-30 15:37:45 -08:00
Zheng Fu
6e7c2c7ca5 Merge "Add backup_id column to raw_contacts, and hash_id column to data" 2015-01-30 21:16:52 +00:00
Fyodor Kupolov
babdb0dc36 Merge "Removed userHandle from setXXX methods" 2015-01-30 19:21:10 +00:00
RoboErik
ddce02f3b9 Merge "Move mute/unmute handling to adjust volume paths" 2015-01-30 18:55:10 +00:00
Alan Viverette
447590524a Merge "Add accessors for switch thumb and track tinting" 2015-01-30 18:53:14 +00:00
Winson Chung
0e0b7310a8 Merge "Adding some debug controls to test multi-window." 2015-01-30 18:43:19 +00:00
Mike Lockwood
5569aa5011 Merge "MidiManager: minor Javadoc tweaks" 2015-01-30 18:33:02 +00:00
Mike Lockwood
c9adb14afd Merge "MidiManager: fix output port close" 2015-01-30 18:19:49 +00:00
Mike Lockwood
a7e348eb4d MidiManager: minor Javadoc tweaks
Change-Id: I8b8f93907b2f456267dee153122d46c6b6e25b80
2015-01-30 10:14:23 -08:00
Alan Viverette
e7eee640f8 Add accessors for switch thumb and track tinting
Bug: 19196145
Change-Id: I5c426bc8c624c75fd27faaf6e0cbef5a0594175a
2015-01-30 10:05:24 -08:00
Alan Viverette
b59041595b Merge "Add transition support to PopupWindow" 2015-01-30 18:04:48 +00:00
Lorenzo Colitti
728dace14d Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee
automerge: a0057ad

* commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9':
  Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:59:49 +00:00
Lorenzo Colitti
a0057ad690 Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56
automerge: 5b392ee

* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
  Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:56:00 +00:00
Lorenzo Colitti
c565a5675a Merge "Also include the domain when parceling StaticIpConfiguration." 2015-01-30 07:07:49 +00:00
Lorenzo Colitti
fba459d345 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 2015-01-30 07:00:38 +00:00
Fyodor Kupolov
bdc58c66af Removed userHandle from setXXX methods
User handle is now extracted from UID of the calling process.

Previously setXXX methods may not work properly, if userHandle parameter
was different from a user of the calling process. In practice, this wouldn't
have happened because setters were always called with a userHandle of the
caller process.

Bug:17202572
Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67
2015-01-29 17:54:06 -08:00
Christopher Ferris
3c1fd311ff am 0654196f: am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
  Fix wrap property creation when truncating.
2015-01-30 00:21:12 +00:00
RoboErik
4197cb60bc Move mute/unmute handling to adjust volume paths
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.

Also updates the hidden master versions of these APIs.

Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
2015-01-29 16:14:30 -08:00
Christopher Ferris
0654196fb0 am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
* commit 'e7a69cbf920565b4b428459198fd53f193080796':
  Fix wrap property creation when truncating.
2015-01-30 00:14:17 +00:00
Winson Chung
d16c565a60 Adding some debug controls to test multi-window.
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.

Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
2015-01-29 15:56:58 -08:00
Zhijun He
043adafffd Merge "Camera2: metadata spec update for reprocessing" 2015-01-29 23:48:02 +00:00
Zhijun He
0e99c2260d Camera2: metadata spec update for reprocessing
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
2015-01-29 15:26:05 -08:00
Zhen Yu Song
72c85bbdf8 Merge "+ Add CarExtender to Notification Bug: 18316420" 2015-01-29 22:54:29 +00:00
Jinsuk Kim
b744db8715 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()
2015-01-29 22:41:23 +00:00
Raph Levien
98cb80d659 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
automerge: 35b5780

* commit '35b5780ec52f3492ae41c36ae30e289bcf78cb11':
  Refine resolution order for typeface and fontFamily
2015-01-29 22:38:41 +00:00
Jinsuk Kim
7e79bdb494 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit 'eb2c4a07a118bb6f41455ffd14f35086298675cd':
  CEC: Do null/empty check against the parameter for checkRecordSource()
2015-01-29 22:37:01 +00:00
Raph Levien
35b5780ec5 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
* commit '2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627':
  Refine resolution order for typeface and fontFamily
2015-01-29 22:36:46 +00:00
Zhen Yu Song
9d5528ba9f + Add CarExtender to Notification
Bug: 18316420

Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
2015-01-29 14:27:28 -08:00
Jinsuk Kim
eb2c4a07a1 am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit 'dbdaea0c6d44ead142f42ac060af2f5cd7f942ac':
  CEC: Do null/empty check against the parameter for checkRecordSource()
2015-01-29 22:26:01 +00:00
Raph Levien
2ed9a7e5ac am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
* commit 'af461e12a12dba8fc544fa373831368ba2c18096':
  Refine resolution order for typeface and fontFamily
2015-01-29 22:25:51 +00:00
Jinsuk Kim
dbdaea0c6d Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 2015-01-29 22:22:31 +00:00
Raph Levien
af461e12a1 Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 2015-01-29 22:11:00 +00:00
Mike Lockwood
2a57bc7fd6 MidiManager: Add USB peripheral MIDI support
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.

Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
2015-01-29 12:59:28 -08:00
Raph Levien
42b3024efd Refine resolution order for typeface and fontFamily
Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.

Bug: 16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
2015-01-29 12:49:19 -08:00
Christopher Ferris
e32df45fe1 Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
Change-Id: Icc1a26593237ca19ad0ebd776a60b3d6290bb355
2015-01-29 12:20:06 -08:00
Alan Viverette
a29b65a37b Merge "Clear accessibility focus when the window loses visibility" 2015-01-29 18:37:38 +00:00
Alan Viverette
5435a30ae5 Add transition support to PopupWindow
Allows framework-added windows to manually specify surface insets, which
enables us to wrap the popup window's elevated content view with a root
view, which in turn allows us to use the Transition API for popup window
transitions.

Fixes a bug where the root view's render node forced clipping.

Bug: 13211166
Change-Id: I303dfa55a052cdf5d3b1485422529123e3cc867a
2015-01-29 10:25:34 -08:00
Mike Lockwood
3b7549ee1f Merge "MIDI Manager: Remove message packetization from MIDI transport" 2015-01-29 17:11:55 +00:00