218863 Commits

Author SHA1 Message Date
Stephen Hines
0fe8ea2096 am 697e3dd6: am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master
* commit '697e3dd6b9a8be4451e19ab7c03ced310602b92a':
  Don't unregister Fonts from renderer at destruction
2015-10-03 00:52:32 +00:00
Stephen Hines
697e3dd6b9 am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master
* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction
2015-10-03 00:46:17 +00:00
Filip Gruszczynski
4b6c23348e Merge "Fix lack of dim layer behind "Power off" window." 2015-10-03 00:36:55 +00:00
Stephen Hines
ee144b1e60 resolved conflicts for bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
2015-10-02 17:34:05 -07:00
Filip Gruszczynski
0689ae9036 Fix lack of dim layer behind "Power off" window.
This enables dim behind functionality for both tasks and stacks and
groups it inside a controller that manages the dim layers (including
shared dim layers for full screen tasks/stacks).

Bug: 24331704

Change-Id: I0d1ba996d9e00d05e0203166b82268da00fbb35e
2015-10-02 17:25:00 -07:00
Stefan Kuhne
52a8504655 Merge "Possible resize flickering on config change" 2015-10-02 23:26:25 +00:00
Skuhne
cc075c76ff Possible resize flickering on config change
It is possible that while a config change is going on, the
view hiererchy got created but not layouted. In that case
the reported size of the main window would be 0,0. In this
event we need to use the cached window sizes from the past
render.

Bug: 24595899
Change-Id: Ia41f7ae0999e4f2bda364506029bcbdfd7d3f4b4
2015-10-02 16:23:44 -07:00
Fyodor Kupolov
4a305c95e1 Merge "Do now allow current user to be removed" 2015-10-02 23:17:36 +00:00
Pirama Arumuga Nainar
f3854aceb5 am 3cb53543: am 24f02483: am 67775422: Retry if interrupted before mMessageThread has joined
* commit '3cb53543e224c0f98801d71c22a2d81974186597':
  Retry if interrupted before mMessageThread has joined
2015-10-02 23:04:55 +00:00
Fyodor Kupolov
d2ca32937f Merge "Restart USB stack only if data is unlocked" 2015-10-02 23:04:07 +00:00
Pirama Arumuga Nainar
3cb53543e2 am 24f02483: am 67775422: Retry if interrupted before mMessageThread has joined
* commit '24f02483172a9802222da29e9db3832b93dd46a6':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:59:51 +00:00
Pirama Arumuga Nainar
24f0248317 am 67775422: Retry if interrupted before mMessageThread has joined
* commit '677754225d9dcd3982d486bc4ead31d6f74de89b':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:54:04 +00:00
Fyodor Kupolov
dabd6b8f45 Restart USB stack only if data is unlocked
When switching users, USB stack shouldn't be restarted if mUsbDataUnlocked =
false, e.g. device is in charge only mode.

Bug: 24611765
Change-Id: I3b12f8c8926235546fe916a200aa57ed618193de
2015-10-02 15:41:46 -07:00
Winson Chung
289747cedb Merge "Refactoring several TaskView callbacks." 2015-10-02 22:41:35 +00:00
Chong Zhang
f66560d6fd Merge "Put ResovlerActivity and noDisplay activities in the source task" 2015-10-02 22:36:44 +00:00
Pirama Arumuga Nainar
677754225d Retry if interrupted before mMessageThread has joined
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit 2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
2015-10-02 15:30:33 -07:00
Chris Craik
bd57dac5d5 Merge "Don't unregister Fonts from renderer at destruction" 2015-10-02 22:30:09 +00:00
Pirama Arumuga Nainar
b90a8813bd am e3ae9e71: am 5fbb2452: am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit 'e3ae9e71b3217e280f5c671591841ae437fd4dab':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:22:13 +00:00
Pirama Arumuga Nainar
e3ae9e71b3 am 5fbb2452: am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '5fbb245230317b5ca312556b73380195871827eb':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:16:20 +00:00
Pirama Arumuga Nainar
5fbb245230 am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit 'ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:08:11 +00:00
Pirama Arumuga Nainar
ca3e5aeaa6 Merge "Retry if interrupted before mMessageThread has joined" 2015-10-02 21:58:50 +00:00
Xiaohui Chen
369d3dcda0 Merge "Cleanup USER_OWNER in pm" 2015-10-02 21:54:37 +00:00
Xiaohui Chen
bb7e5ac58e Merge "Cleanup USER_OWNER in mount service" 2015-10-02 21:54:17 +00:00
Pirama Arumuga Nainar
2f25ce7753 Retry if interrupted before mMessageThread has joined
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
2015-10-02 21:42:12 +00:00
Xiaohui Chen
47f0795d17 Cleanup USER_OWNER in pm
Bug: 19913735
Change-Id: I27947f539ca8346e3abd96fc1f800a65945be128
2015-10-02 14:41:58 -07:00
Xiaohui Chen
621b3fc7a9 Cleanup USER_OWNER in mount service
Also removed a failing unit test and the related code which is
now deprecated.

Bug: 19913735
Bug: 24064753
Change-Id: I9b11130b52caeb0ad890cc6adaaf7fb2fc7b5db6
2015-10-02 14:41:42 -07:00
Chris Craik
148c78f825 Don't unregister Fonts from renderer at destruction
bug:24584749

Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.

Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
2015-10-02 14:21:46 -07:00
Chong Zhang
85ee65483d Put ResovlerActivity and noDisplay activities in the source task
Launch the ResolverActivity in the source task, so that the chooser
stays in the bounds of the task, instead of always at the bottom of
the screen.

Also put the nodisplay activities in the source task, it could launch
other activities (eg. ResolverActivity), we need the original task.

Bug: 24136124
Change-Id: I8b22d7f6cba4dc9e57cb19d357091013a74826bb
2015-10-02 14:13:13 -07:00
Tim Murray
c7b01e6bed am e6a4f902: am 0e28d919: am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit 'e6a4f902617f6bc23a0a43550b89683f1ed63e62':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 21:08:09 +00:00
Tim Murray
e6a4f90261 am 0e28d919: am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '0e28d9196deb28af89c0ea075a91ca45c989fde9':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 20:59:09 +00:00
Tim Murray
0e28d9196d am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '3af80eff608b2ee2de7291f82b9163d5df4b15cf':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 20:54:58 +00:00
Tim Murray
3af80eff60 am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '791763796e5f21e34c3ae81c1faad2a4c1a515dd':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 20:48:04 +00:00
Tim Murray
791763796e Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 2015-10-02 20:43:30 +00:00
Andrew Lee
2d574a5aa8 Merge "Add BLOCKED and REJECTED call types." 2015-10-02 20:37:47 +00:00
Wale Ogunwale
9df717de9a Merge "Fixed issue with not force resizing a task when drag ends." 2015-10-02 20:35:27 +00:00
Jorim Jaggi
be2d7cdb90 am 99d661ff: am c69f4b96: am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '99d661ffc0f1b6626b18d72b6880f1765e3bf3e8':
  Add minimum time for double tap gesture
2015-10-02 20:20:19 +00:00
Jorim Jaggi
99d661ffc0 am c69f4b96: am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit 'c69f4b962e1111ed44399c1243829384f83b9f2f':
  Add minimum time for double tap gesture
2015-10-02 20:15:06 +00:00
Jorim Jaggi
c69f4b962e am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '54afa2bdc2be09542feea634f7a87a0f2f9defac':
  Add minimum time for double tap gesture
2015-10-02 20:08:11 +00:00
Jorim Jaggi
54afa2bdc2 am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '8c66fa94361b51f39f87530f6d1f714120437cc6':
  Add minimum time for double tap gesture
2015-10-02 20:00:34 +00:00
Jorim Jaggi
8c66fa9436 Merge "Add minimum time for double tap gesture" into mnc-dr-dev 2015-10-02 19:55:26 +00:00
Wale Ogunwale
04ad7b1498 Fixed issue with not force resizing a task when drag ends.
We were checking mResizing when the drag ends to see if we
should force resize, but it was being set to false just before
the force resize check in endDragLocked.

Also, don't call AM to resize task if bounds isn't going to change.

Change-Id: Ice2c32a0f15f7489a7c80f21bd79c31104ba4487
2015-10-02 12:43:27 -07:00
Zach Kuznia
4d2a3e2ebd Merge "Use the standard GestureDetector to handle double tap and hold in TouchExplorer." 2015-10-02 19:31:05 +00:00
Toni Barzic
8a20b7021a Merge "[a11y] Add default autoclick delay value to AccessibilityManager" 2015-10-02 19:29:06 +00:00
Fyodor Kupolov
0df68cd13b Do now allow current user to be removed
It was possible to remove a foreground user using pm remove-user command.
The system ends up in the inconsistent state, because switch does not happen
and the removed user stays in the foreground, but its state is removed.

Also added am get-current-user command.

Change-Id: Ida2dce8f99bac55e106cdd44c93e96cc9142d7fb
2015-10-02 12:19:39 -07:00
Tenghui Zhu
117e6daa42 Merge "Early return when the scale is 0." 2015-10-02 17:32:59 +00:00
Chris Craik
f6049a5c55 Merge "Move more utils into paintutils" 2015-10-02 17:28:36 +00:00
Chris Craik
56ce58ee6e Merge "Move ortho matrix out of glop" 2015-10-02 17:28:01 +00:00
Oren Blasberg
a4df8c622d Merge "Change popup menu header color to secondary color." 2015-10-02 17:27:14 +00:00
Teng-Hui Zhu
8d0ec38953 Early return when the scale is 0.
b/24534579

Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
2015-10-02 10:23:32 -07:00
Doris Liu
7b67734fe3 Merge "Fix behavior change for animators without a start delay" 2015-10-02 17:16:34 +00:00