Commit Graph

59704 Commits

Author SHA1 Message Date
Phil Weaver
e58aa16282 Merge "Fix several accessibility magnification issues." into nyc-dev am: 1f70f0b am: 44e272b
am: 5a4be4d

* commit '5a4be4d8a26e844ade76f836163de6c4047ca263':
  Fix several accessibility magnification issues.

Change-Id: I362ed6a9717465668120e75d63ca3e07ab7c7c4d
2016-04-28 00:53:24 +00:00
Felipe Leme
d5890f2f7d Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev am: 0db93ce am: 3b17597
am: 479c9bb

* commit '479c9bbaf971aab9d3ac50acebe41158e53ee342':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: I184d03847abe86dd2f5e10c10bd12f90f7cc14d8
2016-04-28 00:52:46 +00:00
Adam Powell
123ad32f17 Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev am: 8ff7d16 am: a3aef2a
am: fa8d696

* commit 'fa8d696556fa4124953de9be41fd495c748c9f76':
  Don't lose content change during rollback for loader already started

Change-Id: I8f2bfdd63962bc1c83ed68bc43622d06b228a185
2016-04-28 00:51:01 +00:00
Phil Weaver
44e272b469 Merge "Fix several accessibility magnification issues." into nyc-dev
am: 1f70f0b

* commit '1f70f0b7d60ad0b98fe6597162769bce8b85e3ed':
  Fix several accessibility magnification issues.

Change-Id: Ib174d8ff353fd990c5b3119b0728ec942784fbdc
2016-04-27 23:31:54 +00:00
Felipe Leme
3b17597fc5 Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
am: 0db93ce

* commit '0db93cea0fef6aa73caa0ef422b8e0a4e45a24e5':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: I876c9a30e9451b1c346296c233068bdfb579f584
2016-04-27 23:31:49 +00:00
Adam Powell
a3aef2a2b1 Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev
am: 8ff7d16

* commit '8ff7d162c624f9889a8e90ac10b6b554869fef6e':
  Don't lose content change during rollback for loader already started

Change-Id: Ia0ac5631a4f0368121bfeda9d1e74b16d5cf0c31
2016-04-27 23:31:37 +00:00
Adrian Roos
975c918d24 Merge "Fix remote input view clobbering" into nyc-dev
am: 1a101db

* commit '1a101dbc81151942eafaa95762c2e3fd53ceb05f':
  Fix remote input view clobbering

Change-Id: I5166a5594e846576f395031978490be5aa412cd9
2016-04-27 23:31:30 +00:00
Adrian Roos
30ae27011b Merge "Fix remote input view clobbering" into nyc-dev am: 1a101db am: 326475cd
am: d8053d0

* commit 'd8053d042a108a471bc4dc632af8a107575d98d2':
  Fix remote input view clobbering

Change-Id: Ifd5054cb7455ffa0cce94e405e1bf726fe8ccb57
2016-04-27 23:26:16 +00:00
Alan Viverette
9cd773733c Merge "Always account for divider height when calculating list height" into nyc-dev am: fab88ea am: 958f6002
am: de613b2

* commit 'de613b2860b9ba3c916061876a3bf2fdd8123662':
  Always account for divider height when calculating list height

Change-Id: I1abfe8823e029d3c52c629a32b351f6b9985d134
2016-04-27 23:25:31 +00:00
Phil Weaver
ba0f8892d2 Merge "Support zero-length paths for a11y gestures." into nyc-dev am: d803d73 am: 7ae8a52
am: 66e1e24

* commit '66e1e24bebc61a583107023a928cba92951185af':
  Support zero-length paths for a11y gestures.

Change-Id: If9b671a652cea212edf36aa1e736528e7df70cda
2016-04-27 23:25:15 +00:00
Robert Carr
835eb2c0ad Merge "Fix crash when docking." into nyc-dev am: 45ee78c am: 6ad9739
am: 88df0dd

* commit '88df0dd3efeba73dda2d436fdb93d3e4ebe88765':
  Fix crash when docking.

Change-Id: Iae8e8801ab0e237dd25c26854588020778ce74f8
2016-04-27 23:24:55 +00:00
Phil Weaver
1f70f0b7d6 Merge "Fix several accessibility magnification issues." into nyc-dev 2016-04-27 22:50:37 +00:00
TreeHugger Robot
0db93cea0f Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev 2016-04-27 22:41:13 +00:00
TreeHugger Robot
d8053d042a Merge "Fix remote input view clobbering" into nyc-dev am: 1a101db
am: 326475cd

* commit '326475cdb42b7b50ff80e175b450cd43af531924':
  Fix remote input view clobbering

Change-Id: Ieb9b6490e115a5cb91059b0499d520a1e9b38035
2016-04-27 22:27:43 +00:00
TreeHugger Robot
8ff7d162c6 Merge "Don't lose content change during rollback for loader already started" into nyc-dev 2016-04-27 22:25:38 +00:00
TreeHugger Robot
1a101dbc81 Merge "Fix remote input view clobbering" into nyc-dev 2016-04-27 22:17:33 +00:00
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Alan Viverette
958f60022d Merge "Always account for divider height when calculating list height" into nyc-dev
am: fab88ea

* commit 'fab88eab310c892654506b3ad6e0eae4c0a8649e':
  Always account for divider height when calculating list height

Change-Id: Ia9b537030d178ff3e14c53f1f01a340135aac1ce
2016-04-27 22:07:05 +00:00
Phil Weaver
7ae8a529f7 Merge "Support zero-length paths for a11y gestures." into nyc-dev
am: d803d73

* commit 'd803d73331ee295444cc244415b00b985a2d89ea':
  Support zero-length paths for a11y gestures.

Change-Id: I5397937fb736a66fff2344e636939f503898d64a
2016-04-27 22:07:01 +00:00
Robert Carr
6ad97390a3 Merge "Fix crash when docking." into nyc-dev
am: 45ee78c

* commit '45ee78c083906eca68cdade9bc98b64a83372307':
  Fix crash when docking.

Change-Id: Ic2de9854c107886f45024eb4bc620b07b1329a20
2016-04-27 22:06:54 +00:00
Antonio Cansado
b649d42ecf Merge "Fixing network tags." into nyc-dev am: 2c9bb7c
am: 72baa83

* commit '72baa83895fa35be96b8dd2f5f5ac4cbdd5c2795':
  Fixing network tags.

Change-Id: I9fc3fb5a2288a2b90132fcf5cd4576000ba5f1c9
2016-04-27 21:59:13 +00:00
Alan Viverette
fab88eab31 Merge "Always account for divider height when calculating list height" into nyc-dev 2016-04-27 21:50:48 +00:00
TreeHugger Robot
d803d73331 Merge "Support zero-length paths for a11y gestures." into nyc-dev 2016-04-27 21:48:08 +00:00
Antonio Cansado
79335ba880 Merge "Fixing network tags." into nyc-dev
am: 2c9bb7c

* commit '2c9bb7c09a49442ac871115890f93581aa160d46':
  Fixing network tags.

Change-Id: Ie90d6886bde2182ac81ad1b26bdec93a69565c56
2016-04-27 21:39:56 +00:00
Rob Carr
45ee78c083 Merge "Fix crash when docking." into nyc-dev 2016-04-27 21:36:53 +00:00
Antonio Cansado
2c9bb7c09a Merge "Fixing network tags." into nyc-dev 2016-04-27 21:28:13 +00:00
Felipe Leme
89ba9ddf26 Merge "Update background data restrictions intent javadoc." into nyc-dev
am: 8b5e9f1

* commit '8b5e9f1bcf25ae38f812dc750772cf19abba6638':
  Update background data restrictions intent javadoc.

Change-Id: Iaa01becc95debb5aa68cd8308bbe69936e769508
2016-04-27 21:21:00 +00:00
TreeHugger Robot
8b5e9f1bcf Merge "Update background data restrictions intent javadoc." into nyc-dev 2016-04-27 21:16:00 +00:00
Phil Weaver
70439244ba Fix several accessibility magnification issues.
Clarifying region used for magnification as "magnificationRegion",
both in the public API and in the code. There's been significant
confusion about what "magnfifiedRegion" means. Removing
"availableRegion" from everywhere except where it's required, as
that region was identical to magnified/magnification region.

Trying to shut down magnification was a complex situation where
animations in progress and new magnification requests were tricky to
handle correctly. It was not possible to guarantee that the
magnification callbacks were unregistered consistently. There were
at least two situations that led to phone restarts:
1. If a triple tap was detected between unregistering the callbacks
and shutting down the input filter. In this case the magnification
request would go through.
2. If an animation had just started when magnification was turned
off, so the current magnification was 1.0 but the animator was
about to change it. In this case the callbacks would be unregistered,
and then the animator would start changing the magnification.

This change makes registering and unregistering magnification atomic.
It also makes MagnificationController stick around indefinitely once it
is created, registering and unregistering as needed to support
magnification gestures and services that control magnification. Services
that merely query the status of magnification no longer register for
callbacks.

One part of shutting down is turning off the animation and guaranteeing
that it won't try to make further changes. Adding a flag to
SpecAnimationBridge and a lock in that class so we can guarantee that
nothing happens when we aren't registered for magnification callbacks.

Also reconfiguring all accessibility options when a service stops to
make sure that only the features required by the current configuration
are enabled.

Bug: 27497138
Bug: 27821103
Change-Id: If697cbd34b117d82c8eee1ba7d0254089ee4241d
2016-04-27 13:57:43 -07:00
Yin-Chia Yeh
ef7f6cdcd3 Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev
am: 0d7bddc

* commit '0d7bddcbdecf62a72b8a232930de538dff2e93a9':
  Camera: codegen doc update (dynamic black level)

Change-Id: I131e0473f73c6695279f906eefce217f819d2d90
2016-04-27 20:52:12 +00:00
Adam Powell
4be84bb10c Don't lose content change during rollback for loader already started
Framework edition

If a loader is already started when we try to rollback a content
change, force a new load instead of simply setting the flag to refresh
next time.

Bug 28406183

https://code.google.com/p/android/issues/detail?id=208278

Change-Id: If11d79088d30dd2dc48cf1b3d2882f3712b6cddb
2016-04-27 13:45:38 -07:00
Jeff Sharkey
6ed8ae5ec4 Merge "Only log when system UID finds missing data paths." into nyc-dev
am: 2c3f2c4

* commit '2c3f2c4da90613bafc93ed34e53867da10084212':
  Only log when system UID finds missing data paths.

Change-Id: I90b8fe98181dc2b7d00f0c9d320acce316d637e9
2016-04-27 20:41:19 +00:00
Yin-Chia Yeh
0d7bddcbde Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev 2016-04-27 20:40:27 +00:00
Jeff Sharkey
2c3f2c4da9 Merge "Only log when system UID finds missing data paths." into nyc-dev 2016-04-27 20:34:19 +00:00
Dimitry Ivanov
0c6e213dc7 Merge changes I12c9448e,I928175a3 into nyc-dev
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
2016-04-27 20:32:26 +00:00
Alan Viverette
fea4013499 Always account for divider height when calculating list height
List items are always positioned using the divider height, even if there
is no divider drawable, so we should account for that when calculating
list height.

Bug: 28402970
Change-Id: I14b8d3b04a369749ff4b7e6f1e6e003ac08f6b7f
2016-04-27 16:31:33 -04:00
Dimitry Ivanov
cda22ed541 resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp
Change-Id: I09c5c2881947b28547a40febf32f02722b03ef81
2016-04-27 13:16:17 -07:00
Phil Weaver
aa86697b76 Support zero-length paths for a11y gestures.
Allows taps to be made at a single point.

Bug: 28378216
Change-Id: I398882faef77b3200aa9813c8d36c5d806521a22
2016-04-27 13:03:41 -07:00
Jeff Hao
6fdf5951ae Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
am: 864bc48

* commit '864bc48e0104451e20281258429677a9ebbab9ac':
  Support to pass <uses-library> option through to dex2oat.

Change-Id: Ia276b7594e31177f0295e03982aae96267367887
2016-04-27 20:02:24 +00:00
Raph Levien
7bb8e8c7a9 Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev am: 78dd08d am: b22b5d7
am: 8435e68

* commit '8435e68e0ea5401300e2bfb03252b172bdf6be5b':
  Give guidance on alternatives to deprecated locale field

Change-Id: Ic75d9c8e440a9a77faf71d48ebde2b3ee3415b00
2016-04-27 20:01:17 +00:00
Peng Xu
48a4f817ad Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev am: 7b0a3be am: 893b42e
am: 4cb78f8

* commit '4cb78f86d0991a4d89f205cee23fa0150c35f25d':
  Intialize Java Sensor object uuid in JNI

Change-Id: I0655cb508a5d936c825ceb2a3e7fb34ea8aaacae
2016-04-27 20:01:08 +00:00
Robert Carr
311ecba981 Fix crash when docking.
ViewRootImpl may be null at this point if
we didn't preserve. Sorry about the churn.

Bug: 28413589
Change-Id: Iebfd819490252b52332d94ccefbddfae160087cf
2016-04-27 12:59:45 -07:00
Jeff Hao
864bc48e01 Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev 2016-04-27 19:54:04 +00:00
Clara Bayarri
38801e149b Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev am: b639ae6 am: 4852f67
am: 179e405

* commit '179e405df9708ea18c35ee865abbcbccba07bd78':
  Fix TextUtils#getReverse deprecated doc

Change-Id: I5c2875731129ffdd98f02814ebaac7556825e87e
2016-04-27 19:51:38 +00:00
Raph Levien
b22b5d7e60 Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev
am: 78dd08d

* commit '78dd08d5dd49ba3e054e1416849606a22064b389':
  Give guidance on alternatives to deprecated locale field

Change-Id: Ibb3a28940ac9c2baeb3f31c760e651633a39a43f
2016-04-27 19:46:25 +00:00
Peng Xu
893b42e4f8 Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev
am: 7b0a3be

* commit '7b0a3be0012edae0d17e0a92c66b30c9025f5886':
  Intialize Java Sensor object uuid in JNI

Change-Id: I2fd63c82891e1b7290406190d076d08dab4917c5
2016-04-27 19:46:21 +00:00
Raph Levien
78dd08d5dd Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev 2016-04-27 19:42:23 +00:00
Clara Bayarri
4852f67ccd Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev
am: b639ae6

* commit 'b639ae697a07fd1a3755a9d3b3a264c24d685d35':
  Fix TextUtils#getReverse deprecated doc

Change-Id: Id33e49d9f11d47d0bf6badd101b5b08ffeb9150c
2016-04-27 19:41:09 +00:00
Peng Xu
7b0a3be001 Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev 2016-04-27 19:37:59 +00:00
Raph Levien
b639ae697a Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev 2016-04-27 19:31:12 +00:00