Zhijun He
6de4c88271
am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
...
automerge: 0b039b0
2015-02-08 21:29:18 +00:00
Zhijun He
0b039b0315
am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
...
* commit '9f8e82ed968115d14a564397c6b316af3ba42caf':
camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:23:05 +00:00
Zhijun He
9f8e82ed96
am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
...
* commit 'f7f131105d479d30b53b2366e29278fd09f36065':
camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:12:44 +00:00
Zhijun He
f7f131105d
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
...
automerge: 07c745b
2015-02-08 21:04:38 +00:00
Zhijun He
07c745b525
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
2015-02-08 17:38:03 +00:00
Zhijun He
dd72be5971
camera-metadata: clarify the AE precapture trigger spec
...
Doc only change.
Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
2015-02-06 17:51:34 -08:00
Bryce Lee
f5a3fee9d6
am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
...
automerge: d1444b6
2015-02-07 00:41:29 +00:00
Bryce Lee
d1444b63a1
am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
...
* commit '1d97aa4d209d7019402a2925c2ca7eb2e36901c7':
Allow single press of physical button to go home without sleeping.
2015-02-07 00:39:18 +00:00
Bryce Lee
1d97aa4d20
Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
2015-02-07 00:32:27 +00:00
Svet Ganov
11f51ffad2
am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
...
automerge: f89c6f3
2015-02-07 00:16:13 +00:00
Svet Ganov
e7fad2fa90
am 763ce6c0: am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
automerge: 033c2a2
2015-02-07 00:14:54 +00:00
Svet Ganov
f89c6f3c80
am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
...
* commit 'eb642b60e7b1d2a62331303e699df874a50ad527':
Accessibility: ignore children of a view with node provider.
2015-02-07 00:11:05 +00:00
Svet Ganov
033c2a21f8
am 763ce6c0: am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit '763ce6c0c48416a67a36919d1b7ac67d6b73c430':
Accessibility: Handle a missed case when clicking focused views.
2015-02-07 00:10:59 +00:00
Svet Ganov
eb642b60e7
am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
...
* commit 'ff9b2525db61d4c175d9d61a0847586001cd4a11':
Accessibility: ignore children of a view with node provider.
2015-02-06 23:58:52 +00:00
Svet Ganov
763ce6c0c4
am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit '41daba0052f4a9146aad4977da9eccf3c72450ce':
Accessibility: Handle a missed case when clicking focused views.
2015-02-06 23:58:49 +00:00
Svet Ganov
ff9b2525db
am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
...
* commit '34123f1ce83e39a5a6045b1a90a148cd4c514e7e':
Accessibility: ignore children of a view with node provider.
2015-02-06 21:51:15 +00:00
Svet Ganov
41daba0052
am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit '060bca7444b8bf34fa95a6a71daf72fa8a85d78e':
Accessibility: Handle a missed case when clicking focused views.
2015-02-06 21:51:11 +00:00
Svet Ganov
34123f1ce8
Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
2015-02-06 21:49:02 +00:00
Svet Ganov
060bca7444
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-02-06 21:46:25 +00:00
Svet Ganov
55bdb10c16
Accessibility: ignore children of a view with node provider.
...
A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.
The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.
bug:19297093
Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
2015-02-06 12:41:21 -08:00
Bryce Lee
a7e8717eb4
am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter.
...
automerge: 2820911
2015-02-06 20:20:47 +00:00
Bryce Lee
28209111cc
am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter.
...
* commit '53b9fbd1610b6d3deb837dab34fd309d515f6385':
Expose userActivityTimeout through @SystemApi getter/setter.
2015-02-06 20:18:40 +00:00
Bryce Lee
53b9fbd161
Expose userActivityTimeout through @SystemApi getter/setter.
...
This reverts commit 0dad572090
2015-02-06 12:06:34 -08:00
Bryce Lee
404a1327e9
am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
...
automerge: a20e430
2015-02-06 19:45:54 +00:00
Bryce Lee
a20e430d0a
am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
...
* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
Revert "Expose userActivityTimeout through @SystemApi getter/setter."
2015-02-06 19:42:38 +00:00
Bryce Lee
13c7044186
Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
2015-02-06 19:35:43 +00:00
Bryce Lee
0dad572090
Revert "Expose userActivityTimeout through @SystemApi getter/setter."
...
This reverts commit 40a0ee65f2
2015-02-06 19:35:33 +00:00
Bryce Lee
9cd324d158
am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
...
automerge: 7b5f9cd
2015-02-06 19:11:36 +00:00
Bryce Lee
a5669730d0
am 4a88acfc: Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev
...
* commit '4a88acfcc30544fa3424020b1c071d2954a47cb2':
Make THEATER_MODE_ON a System API.
2015-02-06 19:09:32 +00:00
Bryce Lee
7b5f9cde6a
am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
...
* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
Expose userActivityTimeout through @SystemApi getter/setter.
2015-02-06 19:09:28 +00:00
Bryce Lee
4a88acfcc3
Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev
2015-02-06 19:05:45 +00:00
Bryce Lee
4cccd58e42
Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
2015-02-06 19:05:22 +00:00
Scott Kennedy
a1c14fe945
Merge "Make setOn[Long]ClickListener() take a @Nullable argument"
2015-02-06 18:55:19 +00:00
Dianne Hackborn
28fbf95fc2
Merge "First quick implementation of auto assist data."
2015-02-06 18:45:05 +00:00
Dianne Hackborn
a7bb6fbeab
First quick implementation of auto assist data.
...
Introduce new AssistData class that contains all data
the framework automatically generates for assist. Currently
populated with a very simple tree structure representing
the app's view hierarchy.
Reworked how we populate the class name for accessibility
info, so this is provided through a new method call on View
that subclasses can override. This method is also used
to populate the class name in AssistData.
Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
2015-02-06 10:42:44 -08:00
Svet Ganov
0a2cceebd5
Accessibility: Handle a missed case when clicking focused views.
...
The clicking logic was missing the case where a child of the accessibility
focused view reacts to the injected down up events for clicking. This
results of a whole class of views being non-interactive. Now if an event
is targeting accessibility focus and the dispatching view group has this
focus, we clear the flag before dispatching to children, so they can
handle the event rather ignoring it becuase they are not accessibility
focused.
bug:19252492
Change-Id: I6ac25bb7a50b35bb638ca4bfb9fc4198d08c2d4d
2015-02-06 10:23:33 -08:00
Neil Fuller
0b1b82473d
am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
...
automerge: c63efbd
2015-02-06 17:52:57 +00:00
Neil Fuller
c63efbd928
am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
...
* commit '022cf57f82e40a103c4a48c083a59d7fa4936668':
Avoid static initialization of Layout from TextUtils
2015-02-06 17:51:05 +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
d22517a708
am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
automerge: afca061
2015-02-06 16:44:42 +00:00
Kenny Guy
afca06105c
am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
* commit 'b6332fd21a97b846015693684cee9e2af3381f0a':
Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 16:37:11 +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
Narayan Kamath
7869f4c9a3
Merge "Fix breakages in update-api."
2015-02-06 13:31:02 +00:00
Narayan Kamath
0d9ada9fdd
Fix breakages in update-api.
...
doc-comment-check was failing because a couple of javadoc comments
didn't fully qualify R.java's classname where required.
Change-Id: Id0445827e438fd4c1d6e4e9793a00a6cc9f59d3c
2015-02-06 13:14:41 +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
Scott Kennedy
e6ca429720
Make setOn[Long]ClickListener() take a @Nullable argument
...
Change-Id: I923d1f986fa26cbf2a884c52af70469941daf8ea
2015-02-05 21:03:42 -08:00
