Bill Yi
d02a6897cf
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours am: a1df530ac7 -s ours am: 407d517cb8 -s ours
...
am: 35fdd1e3d1
2018-05-17 19:57:29 -07:00
Bill Yi
3f8654fc5d
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4 am: 1803fec75f
...
am: d620aa5fd0
2018-05-17 19:55:18 -07:00
Bill Yi
532835e9c2
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours am: eef34578b3 -s ours am: ede8c555e0 -s ours
...
am: 3befcfc215
2018-05-17 19:48:55 -07:00
Bill Yi
a005a51e35
Merge changes from topic "am-d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
...
am: 8e9cab7943
2018-05-17 19:43:56 -07:00
Bill Yi
a80ecc3d36
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours am: aa961b929b -s ours am: 1190c6d633 -s ours
...
am: c2a90162af
2018-05-17 19:26:20 -07:00
Lucas Dupin
2bd8b6e4f2
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
...
am: 0a72c6b08d
2018-05-17 18:53:18 -07:00
Lucas Dupin
a54d7db28f
Merge "Fix issue where guts would require bouncer" into pi-dev
...
am: a42d8f6e89
2018-05-17 18:44:15 -07:00
Calin Juravle
5e38cbb831
Merge "Allow adb to pull profile snapshots" into pi-dev
...
am: b7aea6d3e2
2018-05-17 18:39:56 -07:00
Bill Yi
35fdd1e3d1
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours am: a1df530ac7 -s ours
...
am: 407d517cb8
2018-05-17 18:37:26 -07:00
Bill Yi
d620aa5fd0
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4
...
am: 1803fec75f
2018-05-17 18:32:19 -07:00
Bill Yi
740543d1b5
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc am: 5897727afc am: 8993fe413b
...
am: 140b527cb8
2018-05-17 18:28:54 -07:00
Bill Yi
3befcfc215
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours am: eef34578b3 -s ours
...
am: ede8c555e0
2018-05-17 18:25:29 -07:00
Bill Yi
a32e326b6d
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817 -s ours am: 60682c726c -s ours am: ea4170f954 -s ours
...
am: 00f925e729
2018-05-17 18:21:17 -07:00
Bill Yi
1449d3dbca
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b am: 43539011e4 am: 6aaa85d953
...
am: 57938aab4c
2018-05-17 18:11:33 -07:00
Bill Yi
bb00cd0f8d
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d am: 81a6ef98f3 -s ours am: 4fb03f2730 -s ours am: 10a8d67215 -s ours
...
am: a032cabf5e
2018-05-17 18:04:34 -07:00
Android Build Merger (Role)
8e9cab7943
Merge changes from topic "am-d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
...
* changes:
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc1ea636faa9e5eaa05dd9439fdb13fca98b5885321221af165eaa961b929b1190c6d633
2018-05-18 01:00:22 +00:00
Bill Yi
6d00a582af
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc am: 1ea636faa9
...
am: e5eaa05dd9
2018-05-17 17:59:42 -07:00
TreeHugger Robot
0a72c6b08d
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
2018-05-18 00:55:35 +00:00
Bill Yi
c2a90162af
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours am: aa961b929b -s ours
...
am: 1190c6d633
2018-05-17 17:53:05 -07:00
TreeHugger Robot
a42d8f6e89
Merge "Fix issue where guts would require bouncer" into pi-dev
2018-05-18 00:51:36 +00:00
Bill Yi
407d517cb8
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours
...
am: a1df530ac7
2018-05-17 17:47:23 -07:00
Calin Juravle
b7aea6d3e2
Merge "Allow adb to pull profile snapshots" into pi-dev
2018-05-18 00:45:14 +00:00
Bill Yi
140b527cb8
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc am: 5897727afc
...
am: 8993fe413b
2018-05-17 17:42:48 -07:00
Bill Yi
1803fec75f
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa
...
am: aaddf187e4
2018-05-17 17:41:19 -07:00
Bill Yi
00f925e729
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817 -s ours am: 60682c726c -s ours
...
am: ea4170f954
2018-05-17 17:36:14 -07:00
Bill Yi
ede8c555e0
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours
...
am: eef34578b3
2018-05-17 17:35:54 -07:00
Bill Yi
dc20f59d06
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c611293d am: b2f28267ad am: 8d249b91bd
...
am: d51b62acb0
2018-05-17 17:30:52 -07:00
Bill Yi
57938aab4c
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b am: 43539011e4
...
am: 6aaa85d953
2018-05-17 17:30:04 -07:00
Bill Yi
e5eaa05dd9
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc
...
am: 1ea636faa9
2018-05-17 17:29:10 -07:00
Bill Yi
a032cabf5e
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d am: 81a6ef98f3 -s ours am: 4fb03f2730 -s ours
...
am: 10a8d67215
2018-05-17 17:23:03 -07:00
Bill Yi
1190c6d633
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours
...
am: aa961b929b
2018-05-17 17:23:00 -07:00
Bill Yi
88616573b5
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0 am: fb795ed727 -s ours am: c31d960f5e -s ours am: 3382016c1a -s ours
...
am: 638c648dc3
2018-05-17 17:22:50 -07:00
Bill Yi
8993fe413b
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc
...
am: 5897727afc
2018-05-17 17:10:29 -07:00
Bill Yi
d51b62acb0
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c611293d am: b2f28267ad
...
am: 8d249b91bd
2018-05-17 17:07:45 -07:00
Bill Yi
ea4170f954
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817 -s ours
...
am: 60682c726c
2018-05-17 17:05:08 -07:00
Bill Yi
0b43ae9114
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev am: 5667f966e5 am: e2790f5d0f am: 7ff9dcf9ee
...
am: 92e47358b1
2018-05-17 17:03:57 -07:00
Bill Yi
638c648dc3
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0 am: fb795ed727 -s ours am: c31d960f5e -s ours
...
am: 3382016c1a
2018-05-17 17:00:55 -07:00
Bill Yi
6aaa85d953
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b
...
am: 43539011e4
2018-05-17 16:57:51 -07:00
Bill Yi
b2633614a5
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa am: a72fe6a957 -s ours am: dc9639ab7f -s ours am: ae7467295e -s ours
...
am: 761c70e87c
2018-05-17 16:56:25 -07:00
Bill Yi
a1df530ac7
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688
...
am: 1c6bdf5174
2018-05-17 16:53:52 -07:00
Bill Yi
10a8d67215
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d am: 81a6ef98f3 -s ours
...
am: 4fb03f2730
2018-05-17 16:52:04 -07:00
Bill Yi
aaddf187e4
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
...
am: 70060539aa
2018-05-17 16:48:54 -07:00
Kristian Monsen
f3e74530e9
Merge "Taking full bug report to get screenshot" into pi-dev
...
am: 57532a220c
2018-05-17 16:48:06 -07:00
Bill Yi
92e47358b1
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev am: 5667f966e5 am: e2790f5d0f
...
am: 7ff9dcf9ee
2018-05-17 16:47:28 -07:00
Lucas Dupin
9b08c01aff
Fix issue where guts would require bouncer
...
There is no need to save the priority if we're
just hiding the controls.
Change-Id: I96551c5d806d5cc4e01a82a7e010000dff029505
Fixes: 78222122
Test: manual
2018-05-17 16:47:17 -07:00
Bill Yi
eef34578b3
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b
...
am: 6959e2b475
2018-05-17 16:46:58 -07:00
Bill Yi
8d249b91bd
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c611293d
...
am: b2f28267ad
2018-05-17 16:45:06 -07:00
Bill Yi
1ea636faa9
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev
...
am: e936691bfc
2018-05-17 16:43:04 -07:00
Bill Yi
aa961b929b
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532
...
am: 1221af165e
2018-05-17 16:40:57 -07:00
Lucas Dupin
f9ca35eb09
Do not allow bouncer translation when scrimmed
...
We had special cases when the bouncer shouldn't be translated but that
doesn't really scale. It's much simpler to just check if it's being
scrimmed - because otherwse it mus be translated.
Change-Id: Ide0af6718f1792ef1a1e16fa39512a2b3a0ba8be
Bug: 78222122
Fixes: 78205990
Fixes: 78140990
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: go/sysui-bouncer-tests
2018-05-17 16:40:50 -07:00
