Commit Graph

42317 Commits

Author SHA1 Message Date
Bryce Lee
4cccd58e42 Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 2015-02-06 19:05:22 +00:00
Neil Fuller
022cf57f82 am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
* commit 'a08934cf54e3120d5019839a4b6d553b3364e8d1':
  Avoid static initialization of Layout from TextUtils
2015-02-06 17:44:49 +00:00
Neil Fuller
a08934cf54 am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
  Avoid static initialization of Layout from TextUtils
2015-02-06 17:37:32 +00:00
Neil Fuller
f789d45b24 Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 2015-02-06 17:30:47 +00:00
Kenny Guy
b6332fd21a am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
  Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 15:37:53 +00:00
Kenny Guy
70fb0ab44e am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
* commit '8debf21357477083a716275e2a32cb7169d42c47':
  Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 15:28:21 +00:00
Kenny Guy
8debf21357 Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 2015-02-06 15:22:23 +00:00
Neil Fuller
d29bdb266d Avoid static initialization of Layout from TextUtils
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
2015-02-06 10:29:54 +00:00
Bryce Lee
40a0ee65f2 Expose userActivityTimeout through @SystemApi getter/setter.
This change will make it accessible to unbundled wear home.

Bug: 18721755
Change-Id: I0634dbc5d8d8ebe25e45af0a1b1186fda5254dd5
2015-02-06 02:42:52 +00:00
Alan Viverette
bbde12138c am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
2015-02-06 00:31:37 +00:00
Alan Viverette
80b381c073 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
  Mutate scroll bar drawables
2015-02-06 00:25:33 +00:00
Alan Viverette
9a166c7da3 Merge "Mutate scroll bar drawables" into lmp-mr1-dev 2015-02-06 00:19:44 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
2015-02-05 15:58:56 -08:00
Filip Gruszczynski
7acd679cb3 Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 2015-02-05 23:19:01 +00:00
Filip Gruszczynski
00de5c9f04 Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 2015-02-05 23:18:41 +00:00
John Spurlock
29fabd8988 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
  Fix a few typos in Parcel.java.
2015-02-05 20:47:23 +00:00
John Spurlock
9adf1c5422 am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
  Fix a few typos in Parcel.java.
2015-02-05 20:39:36 +00:00
Filip Gruszczynski
9fedc72a0b Add wallpaper controlling system apis.
Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211
2015-02-05 12:29:42 -08:00
John Spurlock
ac7b9dd39f am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
  Fix a few typos in Parcel.java.
2015-02-05 20:27:59 +00:00
Ruben Brunk
2a114737c6 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
* commit 'cd0d7cdefef0dbf395e5b159dccb6e884a2077b7':
  camera2: Make legacy error handling more robust.
2015-02-05 20:19:55 +00:00
John Spurlock
42d3b66f48 am e0852368: Fix a few typos in Parcel.java.
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.
2015-02-05 20:18:03 +00:00
Filip Gruszczynski
d05af86e6e Add hidden shutdown method to PowerManager.
Bug: 17420540

We need to be able to shutdown some of wearable devices programatically.
We should be able to do it by connecting to PowerManagerService directly,
but it would be nice to go through the official interface.

Change-Id: Id0cf3b36c03447356fc60fb90cbb2f4b47d8265e
2015-02-05 12:12:43 -08:00
Ruben Brunk
cd0d7cdefe Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 2015-02-05 19:54:37 +00:00
Kenny Guy
74a7024af0 Fix mangled javadoc for setPermittedInputMethods.
Fix java doc for setPermittedInputMethods.

Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
2015-02-05 19:48:38 +00:00
Adam Lesinski
abc88d0743 am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
  Make ArrayMap.EMPTY immutable
2015-02-05 19:39:27 +00:00
Adam Lesinski
967439b4d1 Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 2015-02-05 19:27:00 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
2015-02-05 11:11:03 -08: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
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
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust.
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
2015-02-04 17:26:17 -08: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
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
John Spurlock
e08523684d Fix a few typos in Parcel.java.
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
2015-02-04 23:18:09 +00: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
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
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
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
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