drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
222,078 Commits 1 Branch 0 Tags
Commit Graph

222078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
70c65c8e47 Don't move task if it is already in the destination stack 
When moving a task from one stack to another we detach the source
stack from the display if the stack is empty after the task move.
If the source and destination stack are the same we detach the
stack from the display when the task is removed, but it isn't
re-attached to the display when the task is add back since we
only attach stacks to displays when they are created.
We no longer try to move the task if it is already in the destination
stack.

Bug: 25671469
Change-Id: Idde54d362a35716223bc5f1143000111af380239
 2015-11-13 13:25:16 -08:00
Yang Ni
7ee861abae Merge "Various fixes in setting globals in a script group" 
am: c011ffd842

* commit 'c011ffd84296700df4c28b9fc9fa84da9081de41':
  Various fixes in setting globals in a script group
 2015-11-13 21:17:33 +00:00
Chong Zhang
dd148eafbe Merge "Need to updateSurface if surface size was changed in relayoutWindow" 2015-11-13 21:14:31 +00:00
Yang Ni
c011ffd842 Merge "Various fixes in setting globals in a script group" 2015-11-13 21:11:25 +00:00
Chong Zhang
f4abc2b701 Need to updateSurface if surface size was changed in relayoutWindow 
On some chips, SurfaceControl.setSize will not take effect for several
frames. We have to also do a updateSurface/invalidate (which destroys
and creates the EGLSurface) to get the size right.

Keep track of SurfaceControl size changes in window manager, and pass
that to ViewRootImpl, so that a updateSurface is done either the surface
itself or its size is changed.

Note that we don't use frame size change to trigger updateSurface, because
frame size could be different from the surface size that window manager set.
For example during drag resizing, the surface size is fullscreen although
frame size changes constantly. Doing updateSurface upon frame size change
could cause us to do many unnecessary updateSurface.

bug: 25583942

Change-Id: I1989613a187bb6ef1c179bd2800c6a7b01fcdb3a
 2015-11-13 13:03:48 -08:00
Fyodor Kupolov
9fdc67f900 Merge "Moved system user apps whitelisting to PM" 2015-11-13 20:00:40 +00:00
Wale Ogunwale
69cf50f759 Fixed bug where stack crop wasn't applied when it should 
- Apply stack crop if window isn't animating when replacing window.
We were previously not applying the crop if replacing window regardless
of the animation state.
- Apply stack crop if the current docked window isn't animating.
We were previously not applying if any window in the system is animating.
- Also created setter/getter methods for WindowAnimator.mAnimating
to make debugging easier.

Bug: 25645069
Change-Id: I671549626e218358a7dea9e78bd0b2a1f1b3a51e
 2015-11-13 11:22:17 -08:00
Winson Chung
a1ace2219a Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef am: 20ba5c919b 
am: d2b3d8bff1  -s ours

* commit 'd2b3d8bff1deb5a699a97dd9b3377ff02211e6c6':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 19:02:45 +00:00
Winson Chung
d7532bf4fc Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 am: 3bab0fd4f7 
am: ef5feb290a  -s ours

* commit 'ef5feb290a325a4943d2dea74f5a1f4844567bef':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 19:01:25 +00:00
Winson Chung
d2b3d8bff1 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef 
am: 20ba5c919b

* commit '20ba5c919bb97bb922919a34b3a081ea26b25000':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:51:18 +00:00
Chong Zhang
c90d2b6b3d Merge "Consider stack invisible if it got no running apps." 2015-11-13 18:48:57 +00:00
Winson Chung
20ba5c919b Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 
am: 28fc76ecef

* commit '28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:44:29 +00:00
Adam Lesinski
51c2892768 Merge "AAPT2: Add support for overlays when merging resources" 2015-11-13 18:40:36 +00:00
Winson Chung
d8f89e5f9f Merge "Ensure that the device is provisioned before showing Recents." 2015-11-13 18:38:12 +00:00
Winson
e924356ddf Ensure that the device is provisioned before showing Recents. 
Bug: 25476219
Change-Id: I87b78d4c3ca1e4d71280f057f3e076cc456bbf8f
 2015-11-13 18:37:46 +00:00
Winson Chung
28fc76ecef Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec 
am: ef15ca85d7

* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:37:15 +00:00
Winson Chung
ef5feb290a Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 
am: 3bab0fd4f7

* commit '3bab0fd4f7b848d45ce94b96abbdc537d1e47a5a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:29:35 +00:00
Winson Chung
ef15ca85d7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours 
am: d45a18c8ec

* commit 'd45a18c8eca074f8c83a64ed465021a61becb49a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:29:33 +00:00
Winson Chung
d45a18c8ec Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 
am: 32265b9ea0  -s ours

* commit '32265b9ea000b04ac62f3c114edb063246260401':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:55 +00:00
Winson Chung
3bab0fd4f7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 
am: 1b29fd87a2

* commit '1b29fd87a26d6230c55c701d1411b34342614af0':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:53 +00:00
Winson Chung
32265b9ea0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 
am: b133b984a0

* commit 'b133b984a0644a78270d51007123e75ded24eb14':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:30 +00:00
Winson Chung
1b29fd87a2 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d 
am: 3e9f2b7894

* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:29 +00:00
Winson Chung
b133b984a0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 
am: bb4da4efc3

* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:38 +00:00
Winson Chung
3e9f2b7894 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 
am: dce0f8040d

* commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:35 +00:00
Winson Chung
dce0f8040d Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 2015-11-13 18:02:47 +00:00
Winson Chung
bb4da4efc3 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 2015-11-13 18:02:38 +00:00
Yang Ni
263cc90345 Various fixes in setting globals in a script group 
Bug: 25602504

1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.

2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.

3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.

Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
 2015-11-13 10:00:12 -08:00
Filip Gruszczynski
0fb9e4f535 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca am: 0e6007d229 
am: f9661eafa0  -s ours

* commit 'f9661eafa0de1e9fe0bdf12d8c23ad087ece8729':
  Initialize DisplayContent base info when object is constructed
 2015-11-13 17:47:32 +00:00
Filip Gruszczynski
f9661eafa0 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca 
am: 0e6007d229

* commit '0e6007d22928da4c529a5fa773fbeeb441421804':
  Initialize DisplayContent base info when object is constructed
 2015-11-13 17:26:47 +00:00
Filip Gruszczynski
0e6007d229 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 
am: fe482e0bca

* commit 'fe482e0bcabb98d983ecb4080b35490b9814c809':
  Initialize DisplayContent base info when object is constructed
 2015-11-13 17:20:05 +00:00
Filip Gruszczynski
fe482e0bca Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 2015-11-13 17:15:14 +00:00
Gustav Sennton
371df36b5c Merge "Trigger WebView relro creation when new provider package installed." 2015-11-13 17:08:39 +00:00
Alan Viverette
b6181565e5 Merge "Return correct intrinsic dimensions for inset colors" 2015-11-13 15:48:23 +00:00
Mark Salyzyn
530dcda9a5 Merge "jni: is loggable speedup, not within signal" am: 96e780c99c am: 33a0db92aa 
am: 5f6b645985

* commit '5f6b6459853700c85d71906eb7b758a17ffb32ba':
  jni: is loggable speedup, not within signal
 2015-11-13 15:36:07 +00:00
Mark Salyzyn
5f6b645985 Merge "jni: is loggable speedup, not within signal" am: 96e780c99c 
am: 33a0db92aa

* commit '33a0db92aaf1f50cefaab0215b59e7e513f55d32':
  jni: is loggable speedup, not within signal
 2015-11-13 15:29:35 +00:00
Mark Salyzyn
33a0db92aa Merge "jni: is loggable speedup, not within signal" 
am: 96e780c99c

* commit '96e780c99c46e805989b7f1d6486cef96c7d2c27':
  jni: is loggable speedup, not within signal
 2015-11-13 15:22:05 +00:00
Mark Salyzyn
96e780c99c Merge "jni: is loggable speedup, not within signal" 2015-11-13 15:16:48 +00:00
Erik Kline
9f1c3f099f Merge "Pass both IPv4 and IPv6 DNS servers as tethering DNS forwarders" 2015-11-13 11:54:04 +00:00
Erik Kline
748a509fb1 Pass both IPv4 and IPv6 DNS servers as tethering DNS forwarders 
Bug: 9580643
Change-Id: I5b37b9e7a7a10a624bce79836ef876be9d355e90
 2015-11-13 20:38:41 +09:00
Alan Treadway
46dd449420 Add new ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE intent action. 
Bug: 25462877
Change-Id: I14bcabf993436d9936091aa82fab698eced9e4d6
 2015-11-13 10:22:53 +00:00
Daichi Hirono
18d70d5b7c Split MtpDatabase class into three classes. 
BUG=25162822

Change-Id: Id64b6d9fa11a3214bb855ea8e1344af45fb415ff
 2015-11-13 16:42:50 +09:00
Daichi Hirono
cfcb0c007d Adds new method to update existing documents in MtpDatabase. 
BUG=25162822

Change-Id: I7aa63fc272aa7b57d6a9672565f842774e898a00
 2015-11-13 14:50:48 +09:00
Wale Ogunwale
4ff84631af Initialize DisplayContent base info when object is constructed 
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.

Bug: 22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
 2015-11-12 20:46:07 -08:00
Steve McKay
0c89a3a991 Merge "Handle shift+arrow correctly in single select mode." 2015-11-13 03:36:19 +00:00
Shreyas Basarge
1acc33d7d4 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 am: 9752605815 
am: 69c1bf1de0

* commit '69c1bf1de03037ac75bf0e21dc83b0d7142a0980':
  Sync extras bundle comparison can throw NPE
 2015-11-13 03:01:03 +00:00
Shreyas Basarge
69c1bf1de0 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 
am: 9752605815

* commit '9752605815ee8956e855c468d341e9f18031c53e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:55:08 +00:00
Shreyas Basarge
9752605815 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 
am: d80d24f5b1

* commit 'd80d24f5b13c16ce19369b1debb9137516f59e3f':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:48:52 +00:00
Shreyas Basarge
d80d24f5b1 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:55 +00:00
Matthew Williams
46688366db Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 am: 7336557937 
am: 0d9b625236

* commit '0d9b62523697f1f97e7d16ee82b59ad3b48c1eb9':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:51 +00:00
Matthew Williams
0d9b625236 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 
am: 7336557937

* commit '73365579374d1460aca6abd05dbbc2e1417dee6f':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:35:52 +00:00