Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,446 Commits 3 Branches 0 Tags
14937b2decf1a8136da0699bc4ad0097e8b6739d
Commit Graph

430446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Burns
14937b2dec [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours am: f5933683a7 -s ours 
am: 0bf54bccd7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I79064cc6d5b1f226974152e4a7d30076008fa434
 2019-08-09 16:01:18 -07:00
Ned Burns
0bf54bccd7 [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev am: 68f3bb1305 -s ours 
am: f5933683a7 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I1f3818b203591b5644b4def1db594fb029830487
 2019-08-09 15:51:53 -07:00
Ned Burns
f5933683a7 [automerger skipped] Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev 
am: 68f3bb1305 -s ours
am skip reason: change_id I615b2f7fddca30dae67dbaab0e5d54a824a4c441 with SHA1 2d35980e72 is in history

Change-Id: I37cdb13b72ac7c4da5df1db6ee07209ed20353db
 2019-08-09 15:38:03 -07:00
Sunny Goyal
8897c5edc3 Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev am: 2862d538b6 
am: ffe8886cd3

Change-Id: I0f8a7ac95193789a7013e7d96afb79149490384c
 2019-08-09 15:38:01 -07:00
Sunny Goyal
451b1b6d74 Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev am: 2862d538b6 
am: e1f7db92da

Change-Id: Ia6decd28973d4c55bbb26fc97403357940386945
 2019-08-09 15:27:52 -07:00
Ned Burns
68f3bb1305 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev 2019-08-09 22:21:45 +00:00
Sunny Goyal
e1f7db92da Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev 
am: 2862d538b6

Change-Id: I907985ee2898dbe4a8e5a522934c8e4e332edca0
 2019-08-09 15:18:38 -07:00
Sunny Goyal
ffe8886cd3 Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev 
am: 2862d538b6

Change-Id: Ied33a36a262ad766421321e9f4c53bb07a608fe7
 2019-08-09 15:18:28 -07:00
TreeHugger Robot
2862d538b6 Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev 2019-08-09 21:51:03 +00:00
Bill Yi
f92250ba89 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 32cc5ed314 -s ours 
am: fa110bea9b -s ours
am skip reason: subject contains skip directive

Change-Id: Iad9b473268b8e4c40c637ef02dacfd14e77bde28
 2019-08-09 12:58:51 -07:00
Android Build Merger (Role)
3df86ce4fc Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours am: 3fa31fb1cf -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-09 19:48:47 +00:00
Bill Yi
fa110bea9b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours 
am: 32cc5ed314 -s ours
am skip reason: subject contains skip directive

Change-Id: Icc4d9b64d9d2d9a477a68a5e0fbf0e6cfbc66f16
 2019-08-09 12:47:59 -07:00
Bill Yi
4c2bedc844 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours 
am: 3fa31fb1cf -s ours
am skip reason: subject contains skip directive

Change-Id: I01e77ff2911042bf88181c67c1c1d85b76808e7b
 2019-08-09 12:47:59 -07:00
Bill Yi
43dcada436 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours 
am: d230d40f3b -s ours
am skip reason: subject contains skip directive

Change-Id: I64750bfb717038391c71ec327a41e7869f0b0d15
 2019-08-09 12:47:57 -07:00
Bill Yi
3fa31fb1cf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours 
am: 5c0d577dea -s ours
am skip reason: subject contains skip directive

Change-Id: I8137f4945cc640f35f7de41ca90ba9c3ece572a3
 2019-08-09 12:38:47 -07:00
Bill Yi
d230d40f3b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours 
am: 5c0d577dea -s ours
am skip reason: subject contains skip directive

Change-Id: I44ae5fd2adbf9fec717a65c193cb934b0800d3b9
 2019-08-09 12:37:49 -07:00
Bill Yi
32cc5ed314 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: fe2d421fab -s ours
am skip reason: subject contains skip directive

Change-Id: I74e6fdb371338721dd4e098a59e5e398ef420480
 2019-08-09 12:30:07 -07:00
Bill Yi
5c0d577dea [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: fe2d421fab -s ours
am skip reason: subject contains skip directive

Change-Id: I2b7c8c005bb0d174a451243b9f0b4148f6c427bb
 2019-08-09 12:26:12 -07:00
TreeHugger Robot
fe2d421fab Merge "Import translations. DO NOT MERGE" into qt-dev 2019-08-09 18:42:27 +00:00
Lucas Dupin
2fe1574e7c Merge "Fade from black when reach" into qt-r1-dev am: 331cdb72e6 
am: 78d9978fa6

Change-Id: I9fada8bfcf65450fc7a6deb1f98ec8effd5061c1
 2019-08-09 11:26:44 -07:00
Ned Burns
c0b41a93b4 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev am: 9a38205327 
am: 45fb016801

Change-Id: Ic5ad9607bce02b13663b6b05bb5da3fd796a97f6
 2019-08-09 11:22:23 -07:00
Fabian Kozynski
ab13543f7c Merge "Prevent QSPanel from remeasuring" into qt-qpr1-dev 
am: acc44b21a6

Change-Id: I9275ec47c4f8dab6b749426468829e061c69d67e
 2019-08-09 11:17:46 -07:00
Android Build Merger (Role)
eb9c76efab Merge "Merge "Fade from black when reach" into qt-r1-dev am: 331cdb72e6 am: f81411592b" into qt-qpr1-dev-plus-aosp 2019-08-09 18:13:16 +00:00
Lucas Dupin
91ab7bfca6 Merge "Do not set guts visibility to transient state" into qt-qpr1-dev 
am: 4bcd36661d

Change-Id: I0e3f1ec5f9e7142e9b802f96f7853a2a42045cb9
 2019-08-09 11:12:21 -07:00
Lucas Dupin
c442f90205 Merge "Fade from black when reach" into qt-r1-dev am: 331cdb72e6 
am: f81411592b

Change-Id: I93d665cab8dab34c31371fba1e75ec6d4a4b0bd1
 2019-08-09 11:12:21 -07:00
Android Build Merger (Role)
4b8e02d15b Merge "Merge "Assume sensors perform prox check" into qt-qpr1-dev am: e28124af92" into qt-qpr1-dev-plus-aosp 2019-08-09 18:07:26 +00:00
Lucas Dupin
b36ff62add Merge "Assume sensors perform prox check" into qt-qpr1-dev 
am: e28124af92

Change-Id: Ic155582a43bdee1b9d7a225e39d22399837864e5
 2019-08-09 11:06:47 -07:00
Ned Burns
f4f194cc56 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev am: 9a38205327 
am: 77de201ab2

Change-Id: I2e42b47d9e3ce38b6eee3685b76c9879d0541c3a
 2019-08-09 11:05:43 -07:00
Lucas Dupin
78d9978fa6 Merge "Fade from black when reach" into qt-r1-dev 
am: 331cdb72e6

Change-Id: I94c39e651621b47e3bad580df1b0895e91cf1d42
 2019-08-09 11:00:00 -07:00
Lucas Dupin
f81411592b Merge "Fade from black when reach" into qt-r1-dev 
am: 331cdb72e6

Change-Id: Ie62f5e4dcbdb13de2a58c3fe56277bdc52249d03
 2019-08-09 10:58:10 -07:00
Ned Burns
45fb016801 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev 
am: 9a38205327

Change-Id: Ic9c363e93356cfdd6ae157da39064bf70b3b400d
 2019-08-09 10:56:10 -07:00
Fabian Kozynski
acc44b21a6 Merge "Prevent QSPanel from remeasuring" into qt-qpr1-dev 2019-08-09 17:53:39 +00:00
Ned Burns
77de201ab2 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev 
am: 9a38205327

Change-Id: I570ce1e57c3a7a0be4cc252b144c775312703617
 2019-08-09 10:52:52 -07:00
TreeHugger Robot
4bcd36661d Merge "Do not set guts visibility to transient state" into qt-qpr1-dev 2019-08-09 17:52:24 +00:00
Lucas Dupin
e28124af92 Merge "Assume sensors perform prox check" into qt-qpr1-dev 2019-08-09 17:43:50 +00:00
TreeHugger Robot
331cdb72e6 Merge "Fade from black when reach" into qt-r1-dev 2019-08-09 17:39:40 +00:00
Ned Burns
6c34506dd8 Ensure isTopBucket() gets set when there is just one notification 
My descendants will vilify this CL for generations to come. We'll
clean it up for R, but this is our last, best hope for fixing things
in Q.

Bug: 138775282

Test: manual
Change-Id: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
Merged-In: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
(cherry picked from commit 2d35980e72)
 2019-08-09 17:28:27 +00:00
Ned Burns
9a38205327 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev 2019-08-09 17:27:58 +00:00
Android Build Merger (Role)
136eba7276 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours am: 251258f382 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-09 17:24:48 +00:00
Bill Yi
715468a3fa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours 
am: 251258f382 -s ours
am skip reason: subject contains skip directive

Change-Id: I3bcc04339ba1cce8fa29aef95841da58264fb781
 2019-08-09 10:24:04 -07:00
Bill Yi
2573e061e6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours 
am: b3c1bb04b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I31eaf1a8e95678a3f92de071e6767db67c29bc72
 2019-08-09 10:22:56 -07:00
Bill Yi
251258f382 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: c7a7eaa776 -s ours
am skip reason: subject contains skip directive

Change-Id: I2a31c8db2f31f7f80a21845c358cc8ff26cb0fd1
 2019-08-09 10:11:47 -07:00
Bill Yi
b3c1bb04b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: c7a7eaa776 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ec2792ce542e9c39bf25843d16ff5b4df038d68
 2019-08-09 10:11:47 -07:00
TreeHugger Robot
c7a7eaa776 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-09 16:52:31 +00:00
Bill Yi
fb39d93d3c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 3e9656e544 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic37de2081b841d2f870fd0e5bf13c86d863b23b4
 2019-08-09 09:50:32 -07:00
TreeHugger Robot
3e9656e544 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-08-09 16:27:20 +00:00
Kyunglyul Hyun
76ca4c555b Merge "Add klhyun@ to media OWNERS" am: 454029142c am: a7a67d17b6 am: 81d17f56dd 
am: 7e94a44977

Change-Id: I455135cb4a17ab49285a5a38a3cd07fb2090e3e5
 2019-08-09 07:59:20 -07:00
Kyunglyul Hyun
7e94a44977 Merge "Add klhyun@ to media OWNERS" am: 454029142c am: a7a67d17b6 
am: 81d17f56dd

Change-Id: I9b23d3c82f4ef2eaabb71036f3e6685650661de0
 2019-08-09 07:48:59 -07:00
lumark
f4e96e7982 Merge changes from topic "cherrypick_for_b_137937105" into qt-qpr1-dev 
am: b24f30c685

Change-Id: I93d359b043788513a73e016186cc831f361e9763
 2019-08-09 07:48:35 -07:00
lumark
290d6f3546 DO NOT MERGE: Fix ActivityView surface can't visible for ActivityViewTest 
am: dc9b319039

Change-Id: Iedaebd2888f402e382a4eaf0d7385df2c17d0bdd
 2019-08-09 07:48:32 -07:00