Commit Graph

47545 Commits

Author SHA1 Message Date
Alan Viverette
00a1fa3e43 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
automerge: f1a4d0e

* commit 'f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4':
  Invalidate SubtitleView during setText()
2015-02-05 23:00:44 +00:00
Alan Viverette
f1a4d0e864 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()
2015-02-05 19:39:14 +00:00
Alan Viverette
f15f6a5087 Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 2015-02-05 19:16:58 +00:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText()
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
2015-02-05 09:58:49 -08:00
Alan Viverette
eeb69d171b Move layer-list to be top-level element in seek bar progress automerge: bac8e12
automerge: 6708ac4

* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
  Move layer-list to be top-level element in seek bar progress
2015-02-05 03:45:31 +00:00
Zhijun He
1350671f40 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
  Camera2: relax the EV compensation requirements
2015-02-05 03:44:01 +00:00
Alan Viverette
6708ac40f2 Move layer-list to be top-level element in seek bar progress
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
2015-02-05 03:35:27 +00:00
Alan Viverette
c2bf7440ba Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
  Allow top-level drawable container in progressDrawable
2015-02-05 02:39:32 +00:00
Zhijun He
6bafb86655 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
2015-02-05 02:15:49 +00:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
2015-02-05 01:13:06 +00:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Alan Viverette
80252a92e5 Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3 Allow top-level drawable container in progressDrawable
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
2015-02-04 16:44:02 -08:00
George Mount
8e7c154b07 Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c
automerge: 23eef1e

* commit '23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
2015-02-05 00:32:01 +00:00
George Mount
23eef1ec5e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
automerge: c3a043c

* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
2015-02-05 00:15:50 +00:00
George Mount
c3a043cf0e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
2015-02-04 15:27:56 -08:00
Zhijun He
f1745ce8a8 Camera2: relax the EV compensation requirements
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
2015-02-04 13:59:43 -08:00
Christopher Ferris
9d25fcae85 am 4fb79d14: Merge "Fix comment according to review."
automerge: ff6cebf

* commit 'ff6cebf0a65f9d6e20497295a1a9c290df85052b':
  Fix comment according to review.
2015-02-04 19:29:56 +00:00
Christopher Ferris
7254c123a1 Fix comment according to review.
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
2015-02-04 10:40:12 -08:00
Lajos Molnar
d8e6a8b764 am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
  camera2: limit flexYUV array size in DngCreator
2015-02-03 23:23:11 +00:00
Lajos Molnar
6999ef3488 camera2: limit flexYUV array size in DngCreator
automerge: fdb2112

* commit 'fdb2112bbc140aab869aac047454cd2f67809df1':
  camera2: limit flexYUV array size in DngCreator
2015-02-03 23:16:28 +00:00
Lajos Molnar
fdb2112bbc camera2: limit flexYUV array size in DngCreator
corrected overread

Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
2015-02-03 14:57:09 -08:00
Svetoslav
f8acd7a961 Fix broken activation of the selected view in accessibility mode. automerge: ded133c
automerge: b6b526e

* commit 'b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3':
  Fix broken activation of the selected view in accessibility mode.
2015-02-03 07:27:33 +00:00
Svetoslav
b6b526eaaf Fix broken activation of the selected view in accessibility mode.
automerge: ded133c

* commit 'ded133c446fa9d0d23e6bde19a66fb2ce3980491':
  Fix broken activation of the selected view in accessibility mode.
2015-02-03 07:20:34 +00:00
Svetoslav
ded133c446 Fix broken activation of the selected view in accessibility mode.
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.

This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.

The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.

bug:18986806
bug:18889611

Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
2015-02-02 23:17:17 +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
Christopher Ferris
5d0cf917c3 am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
* commit 'fd41feee6b909670010da79a0800c1aa2ce44255':
  Fix wrap property creation when truncating.
2015-01-30 02:33:34 +00: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
Christopher Ferris
95b1048d39 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

(cherry picked from commit e32df45fe1)

Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
2015-01-29 15:54:40 -08:00
Raph Levien
61ff4d1deb am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
* commit 'd24047dcfed3fb7c913a0a5950c9f48ce3d49b9e':
  Use constants instead of resources for ellipsis.
2015-01-29 23:17:01 +00:00
Raph Levien
d24047dcfe Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 2015-01-29 23:04:15 +00:00
Igor Viarheichyk
6f9f1d4b3b Use constants instead of resources for ellipsis.
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

(cherry-pick of ed0daa93e48d38e54a7ad1c99c461510a4c07599.)

Bug: 18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
2015-01-29 15:00:13 -08: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
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
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
Lorenzo Colitti
d0cc544039 Also include the domain when parceling StaticIpConfiguration.
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.

Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
2015-01-29 12:20:55 +00:00
Paul Jensen
b3b70975d9 Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

(cherry picked from commit c53113b37f)

bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b
2015-01-29 17:12:35 +09:00
Jinsuk Kim
c8aaaef20f CEC: Do null/empty check against the parameter for checkRecordSource()
This prevents out-of-bound exception from occurring.

Bug: 19188370
Change-Id: I051dccf7760cb542ea3dc9b0adc9625fa2ad8b1f
2015-01-29 16:28:37 +09:00
Eino-Ville Talvala
745d45e0c0 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21
* commit '06b1014cf28431706d42219549170896bd581a29':
  Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:29:23 +00:00
Eino-Ville Talvala
06b1014cf2 Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
automerge: a17ab21

* commit 'a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
  Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:22:56 +00:00
Eino-Ville Talvala
a17ab21d4c Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 2015-01-28 23:20:01 +00:00
Jose Lima
485f6a60e0 am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
  Fix crash caused by disabling the Options panel on TVs
2015-01-28 21:27:33 +00:00