Commit Graph

246497 Commits

Author SHA1 Message Date
Alex Hills
3c24df27d9 Merge "Move allowGeneratedReplies to Action" into nyc-dev
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Iac6e24cdf55d4d831f3dbabff3c8b5676a474197
2016-04-28 13:46:35 +00:00
TreeHugger Robot
9de0f87e97 Merge "Move allowGeneratedReplies to Action" into nyc-dev 2016-04-28 13:41:49 +00:00
Yohei Yukawa
1544def0fa Fix stale InputMethodManager#mFullscreenMode.
The current mechanism to sync InputMethodService#mIsFullscreen to
InputMethodManager#mFullscreenMode is really fragile because
  1. Currently the state change is notified via
     InputConnection#reportFullscreenMode(), where InputConnection is
     designed to be valid only while the IME has input focus to the
     target widget.
  2. In favor of performance InputMethodService (IMS) calls
     InputConnection#reportFullscreenMode() only when #mIsFullscreen
     changed.  If InputConnection#reportFullscreenMode() failed, there
     is no recovery mechanism.
  3. Screen oriantation change is likely to cause Window/View focus
     state change in the target application, which is likely to
     invalidate the current InputConnection.

What our previous workaround [1] did for Bug 21455064 was actually
relaxing the rule 1 only for InputConnection#reportFullscreenMode().
However, my another CL [2] made the lifetime check of InputConnection a
bit more strict again, which revived the issue as Bug 28157836.

Probably a long-term fix would be to stop using InputConnection to sync
that boolean state between IMS and the application.  However, it's too
late to do such a refactoring in N, hence this CL relaxes the rule 1
again keeping it as secure as possible.

The idea is that we allow InputConnection#reportFullscreenMode() to
update InputMethodManager#mFullscreenMode regardless of whether
InputConnection is active or not, as long as the InputConnection is
bound to the curent IME.  Doing this as a short-term solution is
supporsed to not introduce any new risk because the active IME is
already able to mess up the InputMethodManager#mFullscreenMode by
calling InputConnection#reportFullscreenMode() on any other active
InputConnection.  Bug 28406127 will track the long-term solution.

 [1]: Id10315efc41d86407ccfb0a2d3956bcd7c0909b8
      da589dffdd
 [2]: If2a03bc84d318775fd4a197fa43acde086eda442
      aaa38c9f1a

Bug: 28157836
Change-Id: Iba184245a01a3b340f006bc4e415d304de3c2696
2016-04-28 12:41:11 +00:00
Jaewan Kim
880eff6e9b Prevent pinned stack from having extra elevation
Pinned stack doesn't have focus, so there's no need for setting extra
elevation to show shadow for focused case.

This removes extra eleavtion for pinned stack, and improves the PIP
animation quality by preventing extra surface size change
at the end of animation.

Bug: 27364161
Change-Id: Id099a78de48b2e038a69600c94454b5cbfe0628f
2016-04-28 21:20:18 +09:00
Clara Bayarri
ec4e0aac8e Fix RTL margins on Power dialog
Bug: 28114019
Change-Id: I838c62b17f2263ade0e8e2d6d7a18d0122ae3534
2016-04-28 11:29:03 +01:00
Martijn Coenen
747fdac426 Merge "Don\'t count vm_map_ram as used memory in vmallocinfo." into nyc-dev
am: bf67e5d

* commit 'bf67e5dc63ab801832e83fd09ae525d937ccb451':
  Don't count vm_map_ram as used memory in vmallocinfo.

Change-Id: I6cc597d7ac15b2154f21a1efa30249ae37f30289
2016-04-28 09:47:33 +00:00
Martijn Coenen
bf67e5dc63 Merge "Don't count vm_map_ram as used memory in vmallocinfo." into nyc-dev 2016-04-28 09:40:13 +00:00
Erik Kline
aa804414aa Merge "IpManager: add distinct DhcpActionTimeoutAlarm" into nyc-dev
am: 42c9a1d

* commit '42c9a1d07adec44ae4c7eadafdb644f9bac9978b':
  IpManager: add distinct DhcpActionTimeoutAlarm

Change-Id: I5bc7c6c96b33f4be7806fadadbd0a122028dc97b
2016-04-28 09:36:00 +00:00
TreeHugger Robot
42c9a1d07a Merge "IpManager: add distinct DhcpActionTimeoutAlarm" into nyc-dev 2016-04-28 09:30:04 +00:00
Andrei Stingaceanu
62c47f0e41 Merge "Fix ListView losing scroll position" into nyc-dev
am: adde076

* commit 'adde076fcba30d1571e985ee36687d3f4300438b':
  Fix ListView losing scroll position

Change-Id: Icec74f7586c950320355bf9642e12d3f666955a3
2016-04-28 09:26:32 +00:00
Clara Bayarri
adde076fcb Merge "Fix ListView losing scroll position" into nyc-dev 2016-04-28 09:20:47 +00:00
Jaewan Kim
66fc3ac40a PIP: Prevent PIP icons in Recents from blinking when PIP is closed
Bug: 28426049
Change-Id: I462877376bced76aa168af4e99a9d8c1f2f1bc98
2016-04-28 17:31:27 +09:00
Erik Kline
fc2e5b6703 IpManager: add distinct DhcpActionTimeoutAlarm
Track provisioning timeouts separately from "DHCP action" timeouts.

Bug: 17733693
Bug: 24837343
Change-Id: I6071699692e7d375155a4c4fe61c7ec0d89396c0
2016-04-28 16:52:10 +09:00
Lorenzo Colitti
634a124d1a Merge "Notify success before configuring the IP address." into nyc-dev
am: d8a028a

* commit 'd8a028af82d993ad2ab4938c9ce2c9a1a4b3fc9f':
  Notify success before configuring the IP address.

Change-Id: I8ec9e8f556e00b4609c7a631110d62c711a44740
2016-04-28 07:10:28 +00:00
Lorenzo Colitti
d8a028af82 Merge "Notify success before configuring the IP address." into nyc-dev 2016-04-28 07:02:09 +00:00
Jorim Jaggi
22ac9feadf Fix IME adjustment for voice interaction windows
am: 4b74f4d

* commit '4b74f4de64806f1d98d9fca172b63fb1daab3b14':
  Fix IME adjustment for voice interaction windows

Change-Id: Ifa140242826684c2e2921169f5506cadb68de32e
2016-04-28 06:15:48 +00:00
Jorim Jaggi
e6456591b4 Fix regression with docking from recents transition
am: 363ab98

* commit '363ab98fced07bf7647355367be9e6ef76751450':
  Fix regression with docking from recents transition

Change-Id: Ifcff80301a002bd43c7c551094be997635987da8
2016-04-28 06:15:47 +00:00
Jorim Jaggi
4b74f4de64 Fix IME adjustment for voice interaction windows
Bug: 28344950
Change-Id: I42fa7abe28a693bc22c878c75839af4ef03e5e8a
2016-04-28 06:11:33 +00:00
Jorim Jaggi
363ab98fce Fix regression with docking from recents transition
Because we move the task to the front in startRecentsActivity, we
always overrode the app transition type. Instead, we should remove
this logic and keep a flag whether the animation was prolonging was
finished already. If it was finished already, don't start the
prolonging when starting the transition.

Bug: 27154882
Change-Id: I1cd9e323867726ebd4b131ed5c13c3834d0f1107
2016-04-28 06:11:01 +00:00
Jorim Jaggi
2130ab0d4b Merge "Clean up updating bounds after config/display info change" into nyc-dev
am: a572863

* commit 'a57286307b3a5a81f78b47d2a0ac6ae2458f66f9':
  Clean up updating bounds after config/display info change

Change-Id: I95f756eedd4b59e7a2c630f98493dedfd36842cf
2016-04-28 06:09:46 +00:00
Jorim Jaggi
a57286307b Merge "Clean up updating bounds after config/display info change" into nyc-dev 2016-04-28 06:03:51 +00:00
Jorim Jaggi
af558e1419 Fix issues with docked stack not un-minimizing
- Add minimize state to dump
- If the docked app goes through a configuration change while the
docked stack is minimizing, the window list becomes temporarily empty,
and thus Task.isVisibleForCurrentUserLocked == false. Since we already
check at the beginning of the animation, we need to finish the minimize
animation on the docked stack no matter what happens.
- Adjust the condition when to notify divider controller about app
visibility. It turns out that under some conditions an animation is set,
but the app is not an element of mClosingApps nor mOpeningApps, so we
missed the visibility change of the home task
- Use getTopAppToken instead of getTopVisibleAppToken. When the token is
about to hide, it's already hiddenRequested, so we skipped changing the
minimize adjustment.

Change-Id: Ib9e2e3f6a5da7b7854b49857299a236e47baa6fc
Fixes: 28184044
2016-04-27 23:01:38 -07:00
Martijn Coenen
0ed7cb3339 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

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

Change-Id: Ifa7022ac298ca537e03fba67b350676a29f0e109
2016-04-28 05:43:11 +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
adacedb1a8 Notify success before configuring the IP address.
This ensures that IpManager has a complete copy of DHCP state
before configuring the IPv4 address. That way, when the netlink
notification of the IPv4 address arrives, we are guaranteed to
have all DHCP information (including DNS servers and routes)
available and we will never send the IPv4 address before the DNS
servers.

Bug: 27605330
Change-Id: I732424dfe2408be9e40028563e99d610b541e12d
2016-04-28 13:56:50 +09:00
Cheryl Potter
f83ba97ef1 Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs am: c89d507
am: 86a5d82

* commit '86a5d8229794579fff375f2a2c2b9809136903a0':
  docs: Polish Android Monitor pages b/26279420

Change-Id: Ibe642578c042dae3f4d6738d6b68f63ed7f4063d
2016-04-28 04:21:57 +00:00
Cheryl Potter
86a5d82297 Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs
am: c89d507

* commit 'c89d5078e79460d081eb09f5fe141a5ba7ad7e64':
  docs: Polish Android Monitor pages b/26279420

Change-Id: Ic47fd05fa40a6c6b2b0cba9cade8ab51ef72cd65
2016-04-28 04:19:00 +00:00
Cheryl Potter
c89d5078e7 Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs 2016-04-28 04:12:45 +00:00
Lorenzo Colitti
7146d02910 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: I07174ba1c20a2ec6a24923eb3f0948b6432e55fa
2016-04-28 04:04:39 +00:00
Jorim Jaggi
1601067287 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: I30248e5462149359c9200aef069245b9950e639a
2016-04-28 04:04:38 +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
Jorim Jaggi
1793d4769b Remove optimization to report config change
Since activity manager only issues a configuration change when
we are not relaunching the activity, the optimization to suppress
that on the client side is not needed anymore and only leads to
issues where there is a change in smallest_width but we are not
relaunching the activity because the change doesn't cross a size
threshold.

Bug: 28050773
Change-Id: I303c190bd7390363d1030edcdb2913b7c64c666d
2016-04-27 20:59:40 -07:00
TreeHugger Robot
831ecc81f9 Merge changes Idb555b01,If8acf31b into nyc-dev
* changes:
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front
2016-04-28 03:58:46 +00:00
Keisuke Kuroyanagi
e2a3b1edd9 Adjust touch position for handles using window coordinate.
Touch position is adjusted in HandleView#onTouchEvent to snap to
ideal offset.
Previously, screen coordinate was used for input, but window
coordinate is used for the ideal offset. As a result, window adjusted touch
position will be adjusted to improper position and a handle being
dragged will get moved to unintended line.

Bug: 22308836

Change-Id: I4a5a3cc695a874c85aa341f06ffcba8b7f5e318c
2016-04-28 12:55:18 +09:00
Jorim Jaggi
eb1cb927ad Clean up updating bounds after config/display info change
We always update the display info before handling the configuration
change. Thus, we remove this weird interleaving asynchronous beast
of code and handle rotation and density in updateBoundsAfterConfigChange
and everything else in updateDisplayInfo.

Sending an asynchronous message to resize the stack only causes race
condition and issues.

Change-Id: Ifa86f62e816917822a8c1d42d13d4bf1ad9bc5bf
Fixes: 28316517
Bug: 28184044
2016-04-27 20:47:47 -07:00
Chong Zhang
8b38593531 Merge "Don\'t wait for visible if there is no running activity left." into nyc-dev
am: 103fdec

* commit '103fdec4151684686f900bd0a3af0a7fa82bf159':
  Don't wait for visible if there is no running activity left.

Change-Id: Iea963aa552092cea3d06e929b7a2828caba5bf4b
2016-04-28 03:47:14 +00:00
Chong Zhang
103fdec415 Merge "Don't wait for visible if there is no running activity left." into nyc-dev 2016-04-28 03:41:01 +00:00
Chong Zhang
50165901a7 Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev
am: 697a3334

* commit '697a3334854da5c2c3830f0489a0e7e4c646a7fb':
  Do not add duplicates to mWaitingVisibleActivities

Change-Id: I2eb3d4300913377a3a654d3d5ddfc8e8ea9f6c91
2016-04-28 03:32:09 +00:00
Chong Zhang
697a333485 Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev 2016-04-28 03:25:51 +00:00
Elliot Waite
988248daab Change custom_link_attributes to path_attributes format.
Change-Id: I24439d6f9226ace37eab875e8b1bb634a9e52074
2016-04-27 20:07:57 -07:00
Jorim Jaggi
cd13d33ee5 Show forced resizable based on top activity
Also don't show it for noDisplay activities.

Bug: 28223489
Change-Id: Idb555b019b5cebdcf16a0cfaa19d64263874735f
2016-04-27 19:26:04 -07: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
Adrian Roos
f848873512 Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev
am: 7461032

* commit '74610328f3298e53200b2588728a8acd7ba35be1':
  Fix contrast enforcement for RemoteInputView

Change-Id: I1053d3cf78e9cc79e92e5766baa1e0ea140eb64c
2016-04-28 01:37:39 +00:00
Jeff Hao
0dcd78763f Merge "Some cleanup for <uses-library> change." into nyc-dev
am: 9f013fe

* commit '9f013fe71ecf03c9c9696599ba82715d84e45365':
  Some cleanup for <uses-library> change.

Change-Id: I3d4a0fbe6433fb991495d90dcc03290dc45b04e0
2016-04-28 01:37:38 +00:00
TreeHugger Robot
74610328f3 Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev 2016-04-28 01:33:43 +00:00
Jeff Hao
9f013fe71e Merge "Some cleanup for <uses-library> change." into nyc-dev 2016-04-28 01:31:17 +00:00
Chong Zhang
824b6dcb55 Don't wait for visible if there is no running activity left.
We could run into this situation on some devices (eg. clockworks),
the next activity doesn't get launched until we destroy this one.

allResumedActivitiesVisible() will return false if there is no other
activity running at all. Check top running activity and it's visibility
instead.

bug: 28400334
Change-Id: Ib8957e499580a10206fdd4e27da19fbc2bdb5843
2016-04-28 01:28:29 +00:00
Peng Xu
71ee16e542 Merge "Fix docs build by adding include <endian.h>" into nyc-dev
am: a969867

* commit 'a96986745f793407a4d83e2b94c620f9e7594c9d':
  Fix docs build by adding include <endian.h>

Change-Id: I4c21692547f5c50848f181c0e0cb492dbdface8c
2016-04-28 01:16:11 +00:00
Dianne Hackborn
2501220e1f Merge "Fix issue #28431297: Crash in system process" into nyc-dev
am: 1a2f993

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

Change-Id: I2a3c9c76a0a9ab708f01265487224b9e19a615ce
2016-04-28 01:16:09 +00:00