Chong Zhang
d14f0980da
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am: b6ee436eee
...
am: 998b21c6b6
2016-08-12 19:58:59 +00:00
Chong Zhang
8a688436ac
DO NO MERGE -- Revert the following two commits as they're causing flickering am: 44bd57ee25
...
am: 26509f52d3
2016-08-12 19:58:55 +00:00
Rob Carr
9d37d21518
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev am: 60ce77aa38
...
am: 4c1a2d5f99
2016-08-12 19:58:50 +00:00
Robert Carr
23f27428f2
Account for scaling of surfaceInset area in magnification. am: 298f9278fd
...
am: b207428305
2016-08-12 19:58:44 +00:00
Chong Zhang
998b21c6b6
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
...
am: b6ee436eee
2016-08-12 19:49:18 +00:00
Chong Zhang
26509f52d3
DO NO MERGE -- Revert the following two commits as they're causing flickering
...
am: 44bd57ee25
2016-08-12 19:49:16 +00:00
Chong Zhang
b6ee436eee
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
2016-08-12 19:44:12 +00:00
Rob Carr
4c1a2d5f99
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev
...
am: 60ce77aa38
2016-08-12 19:42:52 +00:00
Robert Carr
b207428305
Account for scaling of surfaceInset area in magnification.
...
am: 298f9278fd
2016-08-12 19:42:46 +00:00
Chong Zhang
44bd57ee25
DO NO MERGE -- Revert the following two commits as they're causing flickering
...
When double tapping Recents, need to reinvestigate.
b/30831873
b/30790402
Revert "Clear WS.mDestroying on AWT.clearAnimatingFlags"
This reverts commit c2661e52eae3161ac8c02e831290ad50ad395be2.
Revert "Some fixes for transition animation selection"
This reverts commit 73e9bc3f1557f0320c8af843dfb051f27187361d.
2016-08-12 19:40:28 +00:00
Rob Carr
60ce77aa38
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev
2016-08-12 19:37:16 +00:00
Chih-Hung Hsieh
84717d4118
resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3
...
am: c76aa69207
2016-08-12 19:35:08 +00:00
Chih-Hung Hsieh
c76aa69207
resolve merge conflicts of 17bd236 to stage-aosp-master
...
am: b3d46b44a3
2016-08-12 19:30:02 +00:00
Chih-Hung Hsieh
b3d46b44a3
resolve merge conflicts of 17bd236 to stage-aosp-master
...
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
2016-08-12 11:44:16 -07:00
Agnieszka Madurska
2de53cbfae
Merge "Avoid an NPE while checking view location on screen." into cw-f-dev
...
am: 5e933c1e43
2016-08-12 18:18:05 +00:00
Aga Madurska
a78e8d6219
Avoid an NPE while checking view location on screen.
...
am: a56454645f
2016-08-12 18:18:01 +00:00
Agnieszka Madurska
5e933c1e43
Merge "Avoid an NPE while checking view location on screen." into cw-f-dev
2016-08-12 18:08:25 +00:00
Chih-hung Hsieh
17bd236b4b
Merge "Fix clang-tidy warnings in aapt and aapt2."
2016-08-12 18:05:32 +00:00
Yohei Yukawa
b322a818d7
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev am: 41941689b7
...
am: 9b743f1961
2016-08-12 18:05:09 +00:00
Yohei Yukawa
ed56804385
Fix a race to detemine IME switcher visibilityde am: 982a94c5e3
...
am: 28c87d5d3b
2016-08-12 18:05:00 +00:00
Yohei Yukawa
9b743f1961
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev
...
am: 41941689b7
2016-08-12 17:50:07 +00:00
Yohei Yukawa
28c87d5d3b
Fix a race to detemine IME switcher visibilityde
...
am: 982a94c5e3
2016-08-12 17:50:05 +00:00
Yohei Yukawa
41941689b7
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev
2016-08-12 17:43:43 +00:00
Jason Monk
4a337e21ad
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev am: de214f40cf
...
am: bebd3f3f67
2016-08-12 17:19:36 +00:00
Jason Monk
dcd90a1cba
Start listening on notifications/QS panels on expansion started am: b5ece9a9d6
...
am: 81d51c5da9
2016-08-12 17:19:32 +00:00
Jason Monk
bebd3f3f67
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev
...
am: de214f40cf
2016-08-12 17:12:37 +00:00
Jason Monk
81d51c5da9
Start listening on notifications/QS panels on expansion started
...
am: b5ece9a9d6
2016-08-12 17:12:35 +00:00
Jason Monk
de214f40cf
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev
2016-08-12 17:04:47 +00:00
Aga Madurska
a56454645f
Avoid an NPE while checking view location on screen.
...
Bug:30483148
Change-Id: I115da4fefff5fecc04135e2b150e1e77445cb86e
2016-08-12 18:00:25 +01:00
Tyler Gunn
ba9c77f5f5
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev am: 34910458c4
...
am: c05e0a8d35
2016-08-12 15:08:31 +00:00
Tyler Gunn
00101e9438
Add ImsReason codes and DisconnectCauses for data disconnects. am: ed21e8fc0c
...
am: 61d1830a49
2016-08-12 15:07:10 +00:00
Tyler Gunn
c05e0a8d35
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
...
am: 34910458c4
2016-08-12 14:59:37 +00:00
Tyler Gunn
61d1830a49
Add ImsReason codes and DisconnectCauses for data disconnects.
...
am: ed21e8fc0c
2016-08-12 14:59:27 +00:00
Tyler Gunn
34910458c4
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
2016-08-12 14:54:27 +00:00
John Reck
7926832606
Merge "Fix NPE in TextureView" into nyc-mr1-dev am: 4804404e11
...
am: 8bd8703538
2016-08-12 14:39:45 +00:00
John Reck
cdbdd46fb3
Fix NPE in TextureView am: 7e237189c2
...
am: ed1f1399d4
2016-08-12 14:39:36 +00:00
John Reck
8bd8703538
Merge "Fix NPE in TextureView" into nyc-mr1-dev
...
am: 4804404e11
2016-08-12 14:31:52 +00:00
John Reck
ed1f1399d4
Fix NPE in TextureView
...
am: 7e237189c2
2016-08-12 14:31:49 +00:00
John Reck
4804404e11
Merge "Fix NPE in TextureView" into nyc-mr1-dev
2016-08-12 14:25:15 +00:00
Bill Yi
71bc495524
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ccd9ff6157 -s ours
...
am: d4d3503d57
2016-08-12 10:58:14 +00:00
Bill Yi
00a748e8bf
Import translations. DO NOT MERGE am: 7e33c8c4d2 -s ours
...
am: 4415f7ceca
2016-08-12 10:58:09 +00:00
Bill Yi
d4d3503d57
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: ccd9ff6157
2016-08-12 10:51:37 +00:00
Bill Yi
4415f7ceca
Import translations. DO NOT MERGE
...
am: 7e33c8c4d2
2016-08-12 10:51:35 +00:00
TreeHugger Robot
ccd9ff6157
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-08-12 10:44:41 +00:00
Bill Yi
5798a13b5e
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d97f049315 -s ours
...
am: a4fc5f2b76
2016-08-12 09:39:46 +00:00
Bill Yi
a4314f27bc
Import translations. DO NOT MERGE am: ab3feb2c95 -s ours
...
am: 505a717a4b
2016-08-12 09:39:42 +00:00
Bill Yi
fa25ce0fe4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 438c3cbffe -s ours
...
am: 545c97d0b8
2016-08-12 09:39:38 +00:00
Bill Yi
b0998a8837
Import translations. DO NOT MERGE am: cf9a807e7e -s ours
...
am: d943567007
2016-08-12 09:39:34 +00:00
Bill Yi
5de7e1667e
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: d4640c213d
2016-08-12 09:34:32 +00:00
Bill Yi
09e331e97b
Import translations. DO NOT MERGE
...
am: 62a3424ebb
2016-08-12 09:34:26 +00:00
