Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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

* commit '07c745b525d39309a9ea93605fb5f85c295502f1':
  camera-metadata: clarify the AE precapture trigger spec
 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
Svet Ganov
f33fe1f486 Accessibility: Handle a missed case when clicking focused views. 
The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.

bug:19252492

Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
 2015-02-07 10:36:59 -08:00
Elliott Hughes
41ba04eed9 Remove obsolete 'numeric_date_template'. 
The only caller was removed in f91f06a599.

Bug: 18388178
Bug: 18322220
Change-Id: I222363186ad1b9e25c8d8bf0f3928e42cf9bd275
 2015-02-06 18:18:06 -08:00
Joe Fernandez
843b2c7aa9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'e3bc656a623b34d523001e628e779fe2f69e0fb1':
  docs: remove + annotations in version references
 2015-02-07 01:53:04 +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
Joe Fernandez
e3bc656a62 am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'a8b341cdf00e169beb944c0205c98977f835424e':
  docs: remove + annotations in version references
 2015-02-07 01:47:32 +00:00
Jason Sams
46ba27e3fd Implement array types 
Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20
 2015-02-06 17:45:15 -08:00
Joe Fernandez
a8b341cdf0 am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit '5ac30e10ab484fdb7ba3c56b8c162a9061601f8e':
  docs: remove + annotations in version references
 2015-02-07 01:22:13 +00:00
Joe Fernandez
5ac30e10ab am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit '66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
  docs: remove + annotations in version references
 2015-02-07 01:13:52 +00:00
Joe Fernandez
66c06cf9bb am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'd224fb8a6c86b0c26c5db570cead5f19ff7133bd':
  docs: remove + annotations in version references
 2015-02-07 01:08:46 +00:00
Joe Fernandez
d224fb8a6c am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'ba20f98c88b754b3a69d55963275e20ab2fba6bf':
  docs: remove + annotations in version references
 2015-02-07 01:00:53 +00:00
Joe Fernandez
ba20f98c88 Merge "docs: remove + annotations in version references" into lmp-docs 2015-02-07 00:55:17 +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
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
Bryce Lee
35dd319e4a am a7404dbd: Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev 
* commit 'a7404dbde991d36353440546ff8c92e44d218dfe':
  Add voice assist action for global actions.
 2015-02-06 23:08:54 +00:00
Bryce Lee
a7404dbde9 Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev 2015-02-06 23:05:05 +00:00
Matthew Xie
60675b2273 Separate the protection of mProxyServiceStateCallbacks from that of mService 
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190

Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
 2015-02-06 14:13:56 -08:00
Michael Wright
05aab5810a Stop active media projections on user switch. 
Bug: 19278080
Change-Id: I63cc8aa12954d4de257b793967d3845a6f86dc3f
 2015-02-06 14:08:13 -08: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
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.
System api documentation is not updated under PDK builds.

Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
 2015-02-06 12:06:34 -08: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.

Change-Id: Ida1a40db25643f97e82d517bcf147f23e4a3a0fe
 2015-02-06 19:35:33 +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
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
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
d950ad034c 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
(cherry-picked from commit d29bdb266d)

Change-Id: Id0d8578eab9e59d479a7c1b2e7ea1890ac0c8de6
 2015-02-06 17:34:37 +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
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
Chong Zhang
c71d0ccfc7 am 1836f6b8: am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit '1836f6b8f3f34ad31acc04f861c380b186e52193':
 2015-02-06 16:36:50 +00:00
Alan Viverette
c9dff4bd04 am bbde1213: am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit 'bbde12138c748fbe136db5fa9f101ccb9c52ab7b':
 2015-02-06 16:36:31 +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