Commit Graph

58625 Commits

Author SHA1 Message Date
Michael Wright
b3324b4a2e Merge "Properly parcel HdrCapabilities." into nyc-dev
am: 5bddeaa

* commit '5bddeaa9bce6325c900eeabaa6a1cdfaf83910c6':
  Properly parcel HdrCapabilities.

Change-Id: I768887156c78cca859db6123a2bb184f12295ab0
2016-04-28 15:05:44 +00:00
TreeHugger Robot
5bddeaa9bc Merge "Properly parcel HdrCapabilities." into nyc-dev 2016-04-28 15:01:31 +00:00
Chet Haase
5d9a186435 Merge "Document behavior of object references in Animator classes" into nyc-dev
am: faa5726

* commit 'faa572608c7d62b116d3b9c6f28bd7eaddf8dba2':
  Document behavior of object references in Animator classes

Change-Id: Ic57273c1be809c14a642993ac09e203c1fb7247b
2016-04-28 14:41:43 +00:00
Chet Haase
faa572608c Merge "Document behavior of object references in Animator classes" into nyc-dev 2016-04-28 14:33:35 +00:00
Alex Hills
2a1a315713 Merge "Move allowGeneratedReplies to Action" into nyc-dev
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Ic391eb188644107aaa3401bf2a7d64f6ce867a76
2016-04-28 13:46:34 +00:00
TreeHugger Robot
9de0f87e97 Merge "Move allowGeneratedReplies to Action" into nyc-dev 2016-04-28 13:41:49 +00:00
Andrei Stingaceanu
c3176ea42b Merge "Fix ListView losing scroll position" into nyc-dev
am: adde076

* commit 'adde076fcba30d1571e985ee36687d3f4300438b':
  Fix ListView losing scroll position

Change-Id: I84c1f81403633d8e6f7c4b4ed95c018004878205
2016-04-28 09:26:36 +00:00
Clara Bayarri
adde076fcb Merge "Fix ListView losing scroll position" into nyc-dev 2016-04-28 09:20:47 +00:00
Martijn Coenen
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc Merge "Fix API review comments, add remove callback." into nyc-dev 2016-04-28 05:34:05 +00:00
Lorenzo Colitti
40ead811e0 Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
am: 1d3c594

* commit '1d3c59457c9bcf30e6ecb898e64d9d9725e7803e':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Ic58f5be8dce42c17213ef261f348eda31c6c11e7
2016-04-28 05:25:22 +00:00
Jorim Jaggi
c880a803d1 Merge changes Idb555b01,If8acf31b into nyc-dev
am: 831ecc8

* commit '831ecc81f982282bdcc2121c2fa3ece22ac997e0':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib61028c751a31b437fb459bd094c2fedadd40abe
2016-04-28 05:25:19 +00:00
TreeHugger Robot
1d3c59457c Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev 2016-04-28 04:01:11 +00:00
Lorenzo Colitti
c5be12e7ac Make isCaptivePortal perform both HTTP and HTTPS probes.
Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33
2016-04-28 11:23:10 +09:00
Jorim Jaggi
c875ae74ba Don't move forced resizable info activity to the front
If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64
2016-04-27 19:19:04 -07:00
Dianne Hackborn
e96bf3ccdd Merge "Fix issue #28431297: Crash in system process" into nyc-dev
am: 1a2f993

* commit '1a2f993ba5a81899500b989683364708025e13a5':
  Fix issue #28431297: Crash in system process

Change-Id: I46aec10a524e6864b414d12bb2a79bc24d8b47ae
2016-04-28 01:16:12 +00:00
Dianne Hackborn
1a2f993ba5 Merge "Fix issue #28431297: Crash in system process" into nyc-dev 2016-04-28 01:07:26 +00:00
Christopher Tate
294957370e Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev
am: 0731806

* commit '07318065b22ba13ae003d7803a3e48e441f9f6e5':
  Make sure FIRST_LAUNCH is after PACKAGE_ADDED

Change-Id: I91418919b5907986d13b7f9e113ab4c02fa7746a
2016-04-28 00:50:37 +00:00
Chris Tate
07318065b2 Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev 2016-04-28 00:41:02 +00:00
Dianne Hackborn
e761777323 Fix issue #28431297: Crash in system process
Don't allow null URIs to get put into the notification path.

Change-Id: I4f68f438960c8a90c7b417feaa2e19968a3a200a
2016-04-27 17:03:52 -07:00
Badhri Jagan Sridharan
b0ec5e2114 Merge "Add low power stats to batteryhistory" into nyc-dev
am: 5149abe

* commit '5149abe73eb52e5b0df16572397a58c295e23da3':
  Add low power stats to batteryhistory

Change-Id: I9778ada1ccc73041f4682c29d9c8d4ad1bf9e5c1
2016-04-27 23:51:39 +00:00
Badhri Jagan Sridharan
5149abe73e Merge "Add low power stats to batteryhistory" into nyc-dev 2016-04-27 23:32:19 +00:00
Adrian Roos
4dd85783ca Merge "Fix MessagingStyle HUNs" into nyc-dev
am: 5aa8e7d

* commit '5aa8e7d1f12f78dde892bdc6698550e8d1c558c4':
  Fix MessagingStyle HUNs

Change-Id: Ia69ff8eb3ab8a650af205b17e8f64bc877b7df64
2016-04-27 23:32:18 +00:00
Selim Cinek
b12c2e98e9 Merge "Handle empty bigTexts more gracefully" into nyc-dev
am: 1689203

* commit '1689203d5cc33c2490169d7998cf3ffbeb5d35fc':
  Handle empty bigTexts more gracefully

Change-Id: I3e81fdf19cdb4dd9a81e7cd1e1fd61769de0fdf1
2016-04-27 23:31:59 +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
Michael Wright
b082890149 Properly parcel HdrCapabilities.
Since the field might be null, we can't just read and write the
object directly. Use Parcel's convenience methods to do so safely
instead.

Bug: 28427070
Change-Id: I6460c9cb43dc6da97d5fd9edeaa78bdaaf105446
2016-04-27 19:28:29 -04:00
Adrian Roos
5aa8e7d1f1 Merge "Fix MessagingStyle HUNs" into nyc-dev 2016-04-27 23:17:08 +00:00
Selim Cinek
1689203d5c Merge "Handle empty bigTexts more gracefully" into nyc-dev 2016-04-27 22:59:03 +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
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
Christopher Tate
5cf5578a45 Make sure FIRST_LAUNCH is after PACKAGE_ADDED
If an app undergoes restore during install, it is considered 'started'
and the FIRST_LAUNCH broadcast needs to go out.  However, this must not
take place until after the restore operation has fully completed, in
order to avoid publishing the app's existence while it may still be in
an incoherent state.  We now make this broadcast part of POST_INSTALL
in the restore case.

Bundled apps are in the 'started' state regardless, so no FIRST_LAUNCH
broadcast is ever sent for them -- this CL does not change that
existing behavior even in the case of setup-time data restore of
factory-installed packages.

Bug 28173625

Change-Id: Ibcc3758576662dc447b75476173a0d008a9fe4da
2016-04-27 15:07:26 -07: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
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
Selim Cinek
7599878c8a Handle empty bigTexts more gracefully
We're now falling back to the normal text if the bigtext is empty

Bug: 28318145
Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785
2016-04-27 13:44:13 -07:00