Chris Craik
da45222e0a
Merge "Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf am: fa050d6355" into nyc-mr1-dev-plus-aosp
...
am: 5686771d31
* commit '5686771d31b88379b6b58c572e9c39f11a48fa46':
Fix status bar background flicker
Change-Id: I87a4eacafcc9c7178d95844c8b7e5675bc1d5ecb
2016-05-06 02:01:42 +00:00
Chris Craik
555271d3ae
Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf
...
am: fa050d6355
* commit 'fa050d635590328fc787fb14d964585a5641461f':
Fix status bar background flicker
Change-Id: Ia8f181646bbd1943fb7a8e04cc9571a56a5051f7
2016-05-06 01:59:05 +00:00
TreeHugger Robot
d0fa4d3aaf
Merge "Fix status bar background flicker" into nyc-dev
2016-05-06 01:49:34 +00:00
Chris Craik
867b812eff
Fix status bar background flicker
...
Fixes: 28533578
Change-Id: I075f49b7d20e0e95e790a9755d104a0a51575054
2016-05-05 16:22:21 -07:00
Yohei Yukawa
7a7f7412cf
Merge "Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev am: 9f76abc8ab am: 94c9aadc99" into nyc-mr1-dev-plus-aosp
...
am: 20fce5ed58
* commit '20fce5ed585ae0200927b50122366fd0196c565f':
Fix stale InputMethodManager#mFullscreenMode.
Change-Id: I4f1a8071c8cb2c02cb6f8a6ef614363ae73682c3
2016-05-05 22:12:30 +00:00
Dianne Hackborn
906bf903b4
Merge "Fix issue #28602068 : Add count to job scheduler stats" into nyc-dev am: d90be6cccc am: 9071cacdbe
...
am: 9b560795e2
* commit '9b560795e292a9701848e0b0603c7edc68b8bc1d':
Fix issue #28602068 : Add count to job scheduler stats
Change-Id: If3d2f01c1e0aacdcf7ef44eeef46ea84dbfb3b32
2016-05-05 22:12:08 +00:00
Yohei Yukawa
94c9aadc99
Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
...
am: 9f76abc8ab
* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
Fix stale InputMethodManager#mFullscreenMode.
Change-Id: If27212387cd76bb6cc7f1cd1d844bd3ca07915e8
2016-05-05 22:02:30 +00:00
Dianne Hackborn
9071cacdbe
Merge "Fix issue #28602068 : Add count to job scheduler stats" into nyc-dev
...
am: d90be6cccc
* commit 'd90be6cccca683e34566f5550ebb34f1c8e75b69':
Fix issue #28602068 : Add count to job scheduler stats
Change-Id: I2671260e69f3a3b07fd183fa97c274bea7520aca
2016-05-05 22:02:22 +00:00
Yohei Yukawa
9f76abc8ab
Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
2016-05-05 21:55:50 +00:00
Dianne Hackborn
5a969aa139
Fix issue #28602068 : Add count to job scheduler stats
...
Also increase the event buffer size to 100, and implement
it as a real ring buffer. And put that implementation in
a generic class for use in other places.
Change-Id: I06936984e2c253fb5f0eb5d15faf0019ec73d4e2
2016-05-04 17:19:04 -07:00
Winson
8977440c8f
Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev am: bd1708a19d am: 221240d75d
...
am: 9814d5e68b
* commit '9814d5e68b407330eced28f3775d78733670e0d4':
Fixes several animation issues related to a dismissing task.
Pipe the dismiss button logic through the touch handler.
Skip scroll-to animation when undocking and there are no tasks.
Fixing issue with docking being disallowed for secondary user.
Change-Id: I84d308bbf3d8cb4656539eaa65b1c7af99fcbed0
2016-05-03 22:06:06 +00:00
Winson
221240d75d
Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
...
am: bd1708a19d
* commit 'bd1708a19da3ae205c4da3f22d0682c9bd1f76fe':
Fixes several animation issues related to a dismissing task.
Pipe the dismiss button logic through the touch handler.
Skip scroll-to animation when undocking and there are no tasks.
Fixing issue with docking being disallowed for secondary user.
Change-Id: Ib97a145fc6ff4e761a7220979913ed5be9e8fb71
2016-05-03 22:01:30 +00:00
Winson Chung
bd1708a19d
Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
...
* changes:
Fixes several animation issues related to a dismissing task.
Pipe the dismiss button logic through the touch handler.
Skip scroll-to animation when undocking and there are no tasks.
Fixing issue with docking being disallowed for secondary user.
2016-05-03 21:57:03 +00:00
Abodunrinwa Toki
b970e9bf01
Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed am: a04fe4fc92
...
am: 6609b23ae0
* commit '6609b23ae0ce114cd44c4cef1e3c4ebd98bc1623':
Implement alternative ViewGroup.getChildVisibleRect.
Change-Id: I08542776d74a1804e8787458f5f1688fafc34f18
2016-05-03 20:25:16 +00:00
Abodunrinwa Toki
6609b23ae0
Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed
...
am: a04fe4fc92
* commit 'a04fe4fc92b8a60587104f082b590cf787d04b3b':
Implement alternative ViewGroup.getChildVisibleRect.
Change-Id: I37c2543c0c53031a779c3cb93668a4e824eb98b6
2016-05-03 20:22:27 +00:00
Abodunrinwa Toki
98f91884ff
Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev
...
am: f62dd564ed
* commit 'f62dd564edfa7f9e02e17e7a2e3107dbc7b4abb0':
Implement alternative ViewGroup.getChildVisibleRect.
Change-Id: I8adae611f525a14dadc2fc0e2c15cc961b61d0cf
2016-05-03 20:20:05 +00:00
Abodunrinwa Toki
f62dd564ed
Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev
2016-05-03 20:13:26 +00:00
Adam Lesinski
a021b1ebfa
Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev am: 00194e0f24 am: 45b8afabc0
...
am: 2110964764
* commit '211096476447865bc243259b4e3046a766dfe754':
BatteryStats: Fix units on battery charge counter
Change-Id: Id9117da75a7cdc3b4f9b8285de7db8a81d7cba21
2016-05-03 20:00:35 +00:00
Adam Lesinski
45b8afabc0
Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev
...
am: 00194e0f24
* commit '00194e0f2468d3848aee7e65e542bb5224cfd44a':
BatteryStats: Fix units on battery charge counter
Change-Id: I8f58fc683e0f32fd587c31344f51ad2d311570a3
2016-05-03 19:55:39 +00:00
Adam Lesinski
00194e0f24
Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev
2016-05-03 19:47:35 +00:00
Abodunrinwa Toki
4e7a1208ea
Implement alternative ViewGroup.getChildVisibleRect.
...
This CL allows getChildVisibleRect to optionally always call the
view's parent. The previous version attempted to optimize the call
by not calling further up the view heirarchy when the rect isn't
visible in the current view.
The call is hidden and the previous behaviour is preserved to limit
the bits of code that this change affects.
Bug: 28514727
Change-Id: I49550ed4082bcbdcfe4643b962b50f3308092525
2016-05-03 19:41:15 +01:00
Abodunrinwa Toki
752c5d9157
Merge "Fix FloatingToolbar popup positioning." into nyc-dev am: 344d23c0fa am: d162fa3401
...
am: de2d9a1dc5
* commit 'de2d9a1dc5b07905740915225a2559a2e1c364d9':
Fix FloatingToolbar popup positioning.
Change-Id: I957b66612db297b1b069b547a20ca595cf874a8e
2016-05-03 18:27:20 +00:00
Abodunrinwa Toki
d162fa3401
Merge "Fix FloatingToolbar popup positioning." into nyc-dev
...
am: 344d23c0fa
* commit '344d23c0fadd9714453a2bfdebf1d1b304105acf':
Fix FloatingToolbar popup positioning.
Change-Id: I0ef15668c3c0bf4a064871a631b704456d3b6785
2016-05-03 18:22:41 +00:00
Adam Lesinski
a8018ac47a
BatteryStats: Fix units on battery charge counter
...
The unit for the battery charge counter is in micro-Ampere-hours, not coulombs.
We store the value as uAh but display it in dumpsys as mAh.
Bug:27174034
Change-Id: Ib5cc1ee1c5c191336a3e1f18dbb12c38e833f8d0
2016-05-03 10:41:47 -07:00
Vladislav Kaznacheev
efbebb8c9d
Handle drop correctly in BaseIWindow
...
Bug: 28475039
Change-Id: I6a30be0f2c5fe694e85681af387abeabacff9fc9
2016-05-03 09:39:15 -07:00
Abodunrinwa Toki
0780f3a073
Fix FloatingToolbar popup positioning.
...
The FloatingToolbar popup wrongly assumes that the main content panel
is wider than the overflow panel. In situations where this assumption
fails, the toolbar popup is positioned wrongly within it's container
window and items appear truncated. This CL fixes this issue.
Bug: 28550367
Change-Id: I41669b1deed7dd34f0b2bd060d14452482d3d36c
2016-05-03 16:25:41 +01:00
Winson
9832f8f463
Fixing issue with docking being disallowed for secondary user.
...
- When a task is docked, the context is not correct for the given user.
Bug: 28195260
Change-Id: I59f73caf818d294c146d215c2bd31dbe1d4c7c5a
2016-05-02 16:40:00 -07:00
Jaewan Kim
45768d4c3f
Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407 am: 550533dc29
...
am: ce85489d4c
* commit 'ce85489d4cf8d879cd91b539bc00806f3de6bbfb':
Fix crash when device doesn't support picture-in-picture
Change-Id: I3ea6bd8c649db86f535026888efdf61a91b012d5
2016-05-02 22:51:27 +00:00
Selim Cinek
7b6a07253b
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev am: 33f39a96cb am: 93492ed116
...
am: a02ec26052
* commit 'a02ec26052eb71a1bd2596b3ce832da247141393':
Fixed a bug where the image and the text were overlapping
Change-Id: I132dd395177bc13b8f3cc8c83398dd6e58f94d03
2016-05-02 22:51:20 +00:00
Jaewan Kim
ce85489d4c
Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407
...
am: 550533dc29
* commit '550533dc298afbcfbb5f7ba5b3421145ab34522b':
Fix crash when device doesn't support picture-in-picture
Change-Id: I8f16400db11282e28e4e8935896a90eeed49e2f2
2016-05-02 22:41:18 +00:00
Selim Cinek
a02ec26052
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev am: 33f39a96cb
...
am: 93492ed116
* commit '93492ed116bb5c47da9e8c929c36d5db93eae786':
Fixed a bug where the image and the text were overlapping
Change-Id: Ic2e57c1a14f4463e2527b386c4a0e4359a9c91af
2016-05-02 22:41:14 +00:00
Jaewan Kim
1e28182362
Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev
...
am: bfa0f48407
* commit 'bfa0f48407e70099c2558983b19163c1d92d063b':
Fix crash when device doesn't support picture-in-picture
Change-Id: Icbbe69970e5f43387323b5ed810ebc11b1cf77b1
2016-05-02 22:36:31 +00:00
Selim Cinek
e1e991dd93
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev
...
am: 33f39a96cb
* commit '33f39a96cb40850b645833528d275c455898f4d2':
Fixed a bug where the image and the text were overlapping
Change-Id: I23bbae6c0115326c03171f227c2d4a8217f28ae5
2016-05-02 22:36:27 +00:00
Jaewan Kim
bfa0f48407
Merge "Fix crash when device doesn't support picture-in-picture" into nyc-dev
2016-05-02 22:27:54 +00:00
TreeHugger Robot
33f39a96cb
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev
2016-05-02 22:26:40 +00:00
Jaewan Kim
d98dcab679
Fix crash when device doesn't support picture-in-picture
...
Bug: 28512987
Change-Id: Ic8287d70fed491d7493d443ba7d9633b7d9aaea9
2016-05-03 07:13:28 +09:00
Adrian Roos
883416e54f
Merge "Make sure all Notification actions are shown" into nyc-dev am: 9cb7652fb1 am: 798a860efb
...
am: bca6ffddd8
* commit 'bca6ffddd8e9db7f89565a13cc3322e8dbbfdc2a':
Make sure all Notification actions are shown
Change-Id: I221b6755607d55b8e8f2d14ae75017adc08c97cc
2016-05-02 21:32:27 +00:00
Adrian Roos
bca6ffddd8
Merge "Make sure all Notification actions are shown" into nyc-dev am: 9cb7652fb1
...
am: 798a860efb
* commit '798a860efb0c599448483d5a8e6a9429777c5bc5':
Make sure all Notification actions are shown
Change-Id: I094ba82280047da811da0e65e1a2e6d38f88497f
2016-05-02 21:21:47 +00:00
Adrian Roos
d12ceb4d1c
Merge "Make sure all Notification actions are shown" into nyc-dev
...
am: 9cb7652fb1
* commit '9cb7652fb19256fe61d81c7770fe729fc6b67481':
Make sure all Notification actions are shown
Change-Id: I2fd99fc5be798e97b6e8ebc20fe1d2097d2d7c8c
2016-05-02 21:16:07 +00:00
Adrian Roos
9cb7652fb1
Merge "Make sure all Notification actions are shown" into nyc-dev
2016-05-02 21:04:33 +00:00
Selim Cinek
37878683ff
Fixed a bug where the image and the text were overlapping
...
If a notification was updated with an image, the layout could
stay the old one.
Change-Id: Ic012193e79acf14551801e5e2b704ab9519b9c50
Fixes: 28315999
2016-05-02 13:52:29 -07:00
Adam Lesinski
6d21e461e3
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am: 4f928358d2 am: 6226d0a364
...
am: 40e1ef4b0c
* commit '40e1ef4b0cb9b7b8855a64dda18985362a9d1c0d':
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Change-Id: I38e839c1f6d0bc2c692bba5327fa70711b9fc1dc
2016-04-30 03:35:01 +00:00
Adam Lesinski
6226d0a364
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev
...
am: 4f928358d2
* commit '4f928358d2a4023dc6ba5a0bbdb1a63a3e1bfa7a':
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Change-Id: I08146a8a389a753db8eb7f2d925b7f2e986f3b0e
2016-04-30 03:30:30 +00:00
TreeHugger Robot
4f928358d2
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev
2016-04-30 03:26:38 +00:00
Adam Lesinski
28468efe50
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac
...
am: 3bd94c3e8a
* commit '3bd94c3e8a34ad328125783973e5d523eb36f000':
BatteryStats: Keep track of coulomb counter
Change-Id: I3c0bc2e5ddd001a57978fe58f7d4bd511e8a8499
2016-04-30 02:31:26 +00:00
Adam Lesinski
3bd94c3e8a
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd
...
am: 132d565eac
* commit '132d565eacfbf287e4803051b28a0156b996f83f':
BatteryStats: Keep track of coulomb counter
Change-Id: I0b2e127b0b551080ce33794fab09ba4b8a94688e
2016-04-30 02:29:20 +00:00
Adam Lesinski
8fec99caae
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev
...
am: 3cb7f6bdcd
* commit '3cb7f6bdcda2697eff10853360396d8635d66120':
BatteryStats: Keep track of coulomb counter
Change-Id: Ica6666696324ab731324692538b1bb3dfc300d92
2016-04-30 02:27:08 +00:00
TreeHugger Robot
3cb7f6bdcd
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev
2016-04-30 02:21:38 +00:00
Adam Lesinski
1a2b39e61c
BatteryStats: Reset per-User Bluetooth and Modem controller activity
...
Bug:28469956
Change-Id: I4db68ecc5b7bde8dd552caadee489b7bad3d6cbc
2016-04-29 17:56:58 -07:00
Adam Lesinski
926969b411
BatteryStats: Keep track of coulomb counter
...
Bug:27174034
Change-Id: Ica66817faa20b9788536f28f0e593483f033904b
2016-04-29 17:40:11 -07:00