Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
248,447 Commits 3 Branches 0 Tags
e155dcefcaf461c1e312180438fc8675346c4fd5
Commit Graph

8155 Commits

Author SHA1 Message Date
Michael Wright
e6f885912e Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 am: bc57aae am: c348fa3 am: c418909 
am: efb51a0

* commit 'efb51a05afef601ae5286f03ac45558f6dde0849':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0be2af3c08f484ceb69418c5ac044c4d355a0345
 2016-04-18 19:19:36 +00:00
Michael Wright
c418909e9c Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 am: bc57aae 
am: c348fa3

* commit 'c348fa319df3c9980383b904d371ddd93baf5c21':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I52f9cce7770394fa693cc3016b2c1c22e526427d
 2016-04-18 19:08:45 +00:00
Michael Wright
c348fa319d Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 
am: bc57aae

* commit 'bc57aaed0e9ac88a63fa989dba145dc35d048c48':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I7663785a6877f61eaec121303dbdcedcbd242ec6
 2016-04-18 19:03:25 +00:00
Michael Wright
bc57aaed0e Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd 
am: a8064c2

* commit 'a8064c2a8b54881bceade03a9d2f6c1223e055f3':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I4e8d2bff82a3308c5966a0b0c154209b727db669
 2016-04-18 18:57:54 +00:00
Michael Wright
a8064c2a8b Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e 
am: c6629bd

* commit 'c6629bd5dff622a26683269f9201b8d7871c6ef1':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0d602765de707548ede0b1c0a6a38790626e7da1
 2016-04-18 18:52:13 +00:00
Michael Wright
c6629bd5df Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 
am: 224582e

* commit '224582e0403bb123da49d80af21f108900185769':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
 2016-04-18 18:46:44 +00:00
John Reck
a1141701e5 Merge "Merge "Fix NPE checkjni" into nyc-dev am: 2a12c6c am: 660874d" into nyc-mr1-dev-plus-aosp 
am: 1cc94dd

* commit '1cc94dd6e5f2e9b09b6cbe73722aceb9b2795552':
  Fix NPE checkjni

Change-Id: I181b6c0a9b5c8415ab454d88528cbd5f7ef47347
 2016-04-18 18:09:24 +00:00
John Reck
f848f64224 Merge "Fix NPE checkjni" into nyc-dev am: 2a12c6c 
am: 660874d

* commit '660874d1313f950dbddbc309fd50483716a678f4':
  Fix NPE checkjni

Change-Id: I15ab8d4e8a154218de90cb24560be3cabe741a89
 2016-04-18 18:03:44 +00:00
Dan Stoza
aaacb3f3c5 Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev am: 71574c3 am: bbfe7f7 
am: 2785ebc

* commit '2785ebccb4fccc2aa747eab439398e827e2c5d02':
  Revert "Hook up HDR capabilities from native SurfaceControl"

Change-Id: Idf01afd45e5162450078eb48cd9eefe67f36fe8c
 2016-04-18 17:58:21 +00:00
John Reck
18fd148170 Merge "Fix NPE checkjni" into nyc-dev 
am: 2a12c6c

* commit '2a12c6c2cf87be85365025c8a71976cc9117e2f6':
  Fix NPE checkjni

Change-Id: I34f969987f14159d3a3f5c1bb0d09774bf001845
 2016-04-18 17:58:12 +00:00
Dan Stoza
2785ebccb4 Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev am: 71574c3 
am: bbfe7f7

* commit 'bbfe7f7d233f85b91f7ea1f3db7825a724d3b317':
  Revert "Hook up HDR capabilities from native SurfaceControl"

Change-Id: Ib846ac9dd922144ce89ca18aa226aa70f79b32c1
 2016-04-18 17:52:50 +00:00
Dan Stoza
c33adb5acf Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev 
am: 71574c3

* commit '71574c3371441b621700e2829f28e0e6eeec1bd4':
  Revert "Hook up HDR capabilities from native SurfaceControl"

Change-Id: I433d0eacc1b3114af7ad4c1fa8baffee66a3f5c9
 2016-04-18 17:47:35 +00:00
Dan Stoza
71574c3371 Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev 2016-04-18 17:37:57 +00:00
Dan Stoza
2c38f45f27 Revert "Hook up HDR capabilities from native SurfaceControl" 
This reverts commit 49d438ebdf.

Change-Id: Ic41e3006f06784a9fe6adaba6445bb18f2e7fad1
 2016-04-18 17:35:38 +00:00
John Reck
4afbed15f3 Fix NPE checkjni 
Fixes: 28240259

releasedCallback can be null, which we need to check for

Change-Id: Ib218e1c624be8734db5722fc625ebbd72fa099ec
 2016-04-18 10:35:08 -07:00
Dan Stoza
01f70a29d9 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f am: 18120cd 
am: 6b35f57

* commit '6b35f571af17ea4176b812a53ec5069347491887':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Ia283c09c14f4cdbc4b59b7dbcc5df8bc1116eaf0
 2016-04-18 17:10:28 +00:00
Dan Stoza
6b35f571af Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f 
am: 18120cd

* commit '18120cd472b7814bb3e7e468114f5be561bc0412':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Iec5ef8db6169a1c0097faffbb20782a57dfe392f
 2016-04-18 17:05:19 +00:00
Dan Stoza
379aabd81e Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 
am: 554fa0f

* commit '554fa0fa90f1d7eb2b7111c7d93ab3303b4ccdd8':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: I832cfabe3a3fc9a3a5ffaaab1a5cb82bf94cce24
 2016-04-18 17:00:03 +00:00
Dan Stoza
554fa0fa90 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 2016-04-18 16:51:56 +00:00
John Reck
fb25fd47fa Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev am: 736a525 
am: 8fdfaf3

* commit '8fdfaf381257c330d4c919ce5edd0564c89d9313':
  Fix sw legacy compat path in SurfaceView

Change-Id: I5c4c9d2194da8987c7a9612448433d8bf83cf3d0
 2016-04-15 22:39:34 +00:00
John Reck
8fdfaf3812 Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev 
am: 736a525

* commit '736a52538a9072a96dab02c14c89bb2e0a92c645':
  Fix sw legacy compat path in SurfaceView

Change-Id: I6d5961535ce22cf699478e28dd1b6c3e0d6e1379
 2016-04-15 22:34:17 +00:00
John Reck
736a52538a Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev 2016-04-15 22:22:41 +00:00
Svetoslav Ganov
d2dbb241c4 Merge "Properly notify magnification listener" into nyc-dev am: 286c5b7 
am: 7deea71

* commit '7deea716713b6563dc60ed8a60ad300b09b20aff':
  Properly notify magnification listener

Change-Id: I3035fef78780f843a700545b50dbf801d776853e
 2016-04-15 21:45:32 +00:00
Svetoslav Ganov
7deea71671 Merge "Properly notify magnification listener" into nyc-dev 
am: 286c5b7

* commit '286c5b7741dc7632e28f352a4be9bc79dde2d177':
  Properly notify magnification listener

Change-Id: I072355926cec46b71f62ece522d199672ce12d37
 2016-04-15 21:39:34 +00:00
Svetoslav Ganov
286c5b7741 Merge "Properly notify magnification listener" into nyc-dev 2016-04-15 21:32:05 +00:00
Svetoslav Ganov
7d477d4845 Properly notify magnification listener 
bug:28088856

Change-Id: Iffd848082f035319aab3af177921bb3085844ab0
 2016-04-15 14:30:47 -07:00
TreeHugger Robot
dda437bfc6 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev am: b3e26a9 
am: c6eca1d

* commit 'c6eca1da44d33691383b2a47ab4ea3455bac5430':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: I0ac8d03b489bae6eb3ca0aec4cf4a3e110d9ede8
 2016-04-15 20:58:10 +00:00
Jorim Jaggi
c6eca1da44 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev 
am: b3e26a9

* commit 'b3e26a9b414da986963bade0e18a80a20851c74a':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: Ie1982a5e495794e8624c93e970896445579fa98f
 2016-04-15 20:54:37 +00:00
TreeHugger Robot
b3e26a9b41 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev 2016-04-15 20:46:40 +00:00
John Reck
f057fb56f6 Fix sw legacy compat path in SurfaceView 
Fixes: 28074239

Need to convert from scaled window to screen before
updating position of the SurfaceView

Change-Id: I75dec23408c32ec01e88193ea38b1fb253b3fd6f
 2016-04-15 13:46:29 -07:00
John Reck
9a7fa83bc5 Merge "Add a callback for when a gl functor is released" into nyc-dev am: 85cfc8c 
am: 9e06acf

* commit '9e06acf392e82cb539b9e40ec9909a9c8dbc221b':
  Add a callback for when a gl functor is released

Change-Id: I4f3d272a598f45a6124a6fc64f9178f1c4d659a0
 2016-04-15 19:36:15 +00:00
John Reck
9e06acf392 Merge "Add a callback for when a gl functor is released" into nyc-dev 
am: 85cfc8c

* commit '85cfc8c368523359be8c12b8551e122b94972ab7':
  Add a callback for when a gl functor is released

Change-Id: Ie9f602710d46faf045d04ff425bee8428d6fe9c7
 2016-04-15 19:32:51 +00:00
Jorim Jaggi
681fc7b267 Fix wrong transition when dock minimized and docked app launched 
When having an app docked and then going home, and then launching
the app from the homescreen, we had a wrong transition because
getTopMost task was already set to the launched app, because
getRunningTasks doesn't exclude the docked stack. Instead of adding
flags for getRunningTasks, which sounds risky, we just pass a "force"
value when we launch recents in this state.

Bug: 27154882
Change-Id: Iee4512fed13115dbbe8b74413ff1fa9b87afa0ef
 2016-04-15 19:23:05 +00:00
John Reck
cd1c3eba69 Add a callback for when a gl functor is released 
Bug: 27709981

Change-Id: Id5be3e8f88d6d84a9c59c7ed23e7e8862feefbe8
 2016-04-15 10:56:53 -07:00
Jorim Jaggi
6d304c2762 Disable resize when IME is adjusted am: 698e763 
am: 77efec3

* commit '77efec3b61e8083468594f288e27811281e8d515':
  Disable resize when IME is adjusted

Change-Id: I04013df69b368c8aecb53790a7985e38be4641ce
 2016-04-15 04:05:32 +00:00
Jorim Jaggi
77efec3b61 Disable resize when IME is adjusted 
am: 698e763

* commit '698e7634aa2ced554f564f588c2e878fb35757a3':
  Disable resize when IME is adjusted

Change-Id: I27772f9325668c48d878533074d72b07ad78f909
 2016-04-15 04:00:31 +00:00
Jorim Jaggi
698e7634aa Disable resize when IME is adjusted 
Bug: 28175599
Change-Id: I338dd230443973d912f17946ed722789b0f545a2
 2016-04-14 20:45:56 -07:00
John Reck
a749cfa88f Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev am: d6a25c2 
am: fe16c4b

* commit 'fe16c4b105c34f451b4b100c970e1711e793dfe1':
  Revert "Revert "Make stopped state a first-class thing""

Change-Id: I5bd0dd197e2b33d852b48545a24cbf43670a3e4c
 2016-04-14 19:37:04 +00:00
Chris Craik
3f379c9d66 Merge "Destroy drawing cache when switching layer type" into nyc-dev am: 2344c6a 
am: 8c743b0

* commit '8c743b0ee979b9c56e595f78f2ddfba8970888be':
  Destroy drawing cache when switching layer type

Change-Id: I766d3827aec82871730f9663fdd7ae3b00527be4
 2016-04-14 19:35:10 +00:00
Rob Carr
d4561e3974 Merge "Add WindowManager side timeout for toasts." into nyc-dev am: b33daec 
am: 6d94ed1

* commit '6d94ed11db50c7988d63badb0451753a32512a77':
  Add WindowManager side timeout for toasts.

Change-Id: I37d0958941c768c088d21170449c2e218c6c2b0e
 2016-04-14 19:34:10 +00:00
Yuki Awano
2a68999d4f Do not update accessibilityTitle in LayoutParams.setTitle am: 0697c7a 
am: b28d871

* commit 'b28d871a8dc1ae3f78ac6587272f8c8454718188':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: Ie6ce4e042ea3a14e7ed66dad89f4d879e128869b
 2016-04-14 18:48:54 +00:00
TreeHugger Robot
382987244e Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev am: c1699a9 
am: f917e2f

* commit 'f917e2f738f25bcf34ffa073008e872d803458e1':
  Populate RangeInfo correctly when acquiring from pool

Change-Id: I4273c7fe4511b8a542f15b604387e6f27ee6d676
 2016-04-14 18:36:38 +00:00
John Reck
fe16c4b105 Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev 
am: d6a25c2

* commit 'd6a25c2b3e7fd5a98741e2f770cf54d539b29258':
  Revert "Revert "Make stopped state a first-class thing""

Change-Id: Iff85c259e93a54c3e3a9db3f3d2b2f826526de0a
 2016-04-14 17:47:40 +00:00
John Reck
d6a25c2b3e Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev 2016-04-14 17:40:52 +00:00
John Reck
8afcc76920 Revert "Revert "Make stopped state a first-class thing"" 
This reverts commit eab3f2658a.

Fixes first-frame issue, mReportNextDraw needs to override
mStopped

Fixes: 28118961
Fixes: 27286867

Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
 2016-04-14 10:39:03 -07:00
Chris Craik
8c743b0ee9 Merge "Destroy drawing cache when switching layer type" into nyc-dev 
am: 2344c6a

* commit '2344c6a2ae0d6ccd650a13aaedb403fa7e3ea579':
  Destroy drawing cache when switching layer type

Change-Id: I6b455a94c9fa8219201cc32099493fecf82afafc
 2016-04-14 17:12:02 +00:00
Chris Craik
2344c6a2ae Merge "Destroy drawing cache when switching layer type" into nyc-dev 2016-04-14 17:07:35 +00:00
Robert Carr
6d94ed11db Merge "Add WindowManager side timeout for toasts." into nyc-dev 
am: b33daec

* commit 'b33daec8c2e9e12cdb9c7e5db388656fd8aff98f':
  Add WindowManager side timeout for toasts.

Change-Id: I95c5eae99da60c47a1986bab07f6b2fe4f550327
 2016-04-14 16:50:23 +00:00
Rob Carr
b33daec8c2 Merge "Add WindowManager side timeout for toasts." into nyc-dev 2016-04-14 16:23:24 +00:00
Yuki Awano
b28d871a8d Do not update accessibilityTitle in LayoutParams.setTitle 
am: 0697c7a

* commit '0697c7a877d87acd572ed7ce62472d5866375e86':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: I006620e1ac9c8571dd698f45da75284010dc58e9
 2016-04-14 04:21:55 +00:00