Jason Chiu
4af087883d
[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
am: 1dfb8c8644
-s ours am: 70c298e9cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I2997c4c1ca545bd9acad7a552f384551f3d50eac
2020-08-15 02:52:33 +00:00
Yi-Ling Chuang
33d20782ac
[automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: f07366ff12
am: 68e80545b0
-s ours am: 24328feca3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ifffdba024c587936dea7001688ec4b19738d4e93
2020-08-15 02:52:16 +00:00
Jason Chiu
9d0abd684f
[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
am: 0f87cd00a1
-s ours am: ac76b763fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I7afeb0ef7eea928cf14a56ee714e121c970bfbdc
2020-08-15 02:52:12 +00:00
Yi-Ling Chuang
297fc4b9f9
[automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: f046aa5beb
am: ecf25c02f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I2b7e845d99bd0e46d124d1d9508ca5aaded8002e
2020-08-15 02:33:33 +00:00
Yi-Ling Chuang
41e4d66dfd
[automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: c248da2974
am: f9b6dd0fe7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I7af9b8050d0081fc823d4c80568181735f75f4aa
2020-08-15 02:33:31 +00:00
Automerger Merge Worker
a881106238
Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp am: fa9cc7830a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I14200b1599a4fb6a7f5d94c21f90506d9403e12f
2020-08-15 02:33:19 +00:00
Yi-Ling Chuang
2a0b09893f
[automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
am: 09b5db829e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I390cd9424e39426f7022968f716e1d37e5f80f49
2020-08-15 02:33:17 +00:00
Yi-Ling Chuang
d07f4e59ec
[automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: ec05383478
am: 50349a9543
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ibed04dfad384828c997efc54b5d247f296d834ce
2020-08-15 02:32:56 +00:00
Jason Chiu
70c298e9cd
[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
am: 1dfb8c8644
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ie675ec09705d7a010ab6abb114f40c037efac10e
2020-08-15 02:32:54 +00:00
Yi-Ling Chuang
24328feca3
[automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: f07366ff12
am: 68e80545b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I2f7c4737d930fea7a800b79ce10b65c8c477be61
2020-08-15 02:32:41 +00:00
Jason Chiu
ac76b763fa
[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
am: 0f87cd00a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ie37a13a666fae4f956ab447204fd06edc6146538
2020-08-15 02:32:39 +00:00
Yi-Ling Chuang
ecf25c02f0
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: f046aa5beb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Iff0e8b936c7268c8622e8a7079a27d8a0e5be4dd
2020-08-15 02:20:48 +00:00
Yi-Ling Chuang
f9b6dd0fe7
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: c248da2974
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I6988e9ab91ae2cf15e95702c438d4c0529317095
2020-08-15 02:20:46 +00:00
Automerger Merge Worker
fa9cc7830a
Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: 631465df31
2020-08-15 02:20:40 +00:00
Yi-Ling Chuang
09b5db829e
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Ie5cea9ddee70dfbe48de0ce995ee6f4a1bcf36bc
2020-08-15 02:20:35 +00:00
Yi-Ling Chuang
50349a9543
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: ec05383478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I45f3140b7b3beba80536ca9779c33479a29b6a7d
2020-08-15 02:20:34 +00:00
Yi-Ling Chuang
e50265cb43
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: 631465df31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I72029cb7956edadd3faef36de6b0e81176575985
2020-08-15 02:20:32 +00:00
Jason Chiu
1dfb8c8644
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I206e049ba2e6e3652b6a316d269d6cf37af4c0b3
2020-08-15 02:20:30 +00:00
Yi-Ling Chuang
68e80545b0
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: f07366ff12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Id6b9042fe823441588be96689692fe47fbbde049
2020-08-15 02:20:15 +00:00
Jason Chiu
0f87cd00a1
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ib6bcff33b0dc7af2935e937f600cb6832f48febf
2020-08-15 02:20:13 +00:00
Yi-Ling Chuang
f046aa5beb
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I4db8cc713daaa14566b1f44dea0aab1aa01c8ce5
2020-08-15 02:08:58 +00:00
Yi-Ling Chuang
c248da2974
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I76c77c66be5da635571f876d9b76906f789e8472
2020-08-15 02:08:57 +00:00
Yi-Ling Chuang
4d6f8bf34d
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I33d8794e09209d66eb4c9a53a903d18f44ceddbb
2020-08-15 02:08:55 +00:00
Yi-Ling Chuang
631465df31
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Iefb77041715dba0cc2a19210e1353f935e25a8a8
2020-08-15 02:08:53 +00:00
Yi-Ling Chuang
ec05383478
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I7b1bb3f970e12b67608dc2d734a2906099716804
2020-08-15 02:08:44 +00:00
Jason Chiu
4113bf12d0
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Iaf3bcd4f531d7a82aa78c5eba12b44192e3b7df8
2020-08-15 02:08:43 +00:00
Yi-Ling Chuang
f07366ff12
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I93636856e4cbe4e764c7f890ea0e05c810086827
2020-08-15 02:08:38 +00:00
Jason Chiu
68173c1343
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ia3f637ea89d7209cfdbc1a97238e4bfb6d66d77f
2020-08-15 02:08:34 +00:00
Yi-Ling Chuang
8c3987b907
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev
2020-08-15 01:56:27 +00:00
Yi-Ling Chuang
51f80cb3ed
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev
2020-08-15 01:56:05 +00:00
Peiyong Lin
9511d443cb
Rename game driver to updatable driver.
...
Game driver is considered a production name. We should use the term
updatable driver instead of the production name.
Bug: b/164449016
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: I2237dfb22ecd94bc2475249b1460796ac1693d81
2020-08-14 16:29:03 -07:00
Lyn Han
275c7cd35d
Merge "Hide conversation bubble switch if app bubbles are off" am: 354e25c125
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363009
Change-Id: I4e5c9bab127db3529fb42ed788b10e5c5bafeb10
2020-08-14 20:33:41 +00:00
Lyn Han
354e25c125
Merge "Hide conversation bubble switch if app bubbles are off"
2020-08-14 20:18:57 +00:00
Lyn Han
9af95dae7d
Hide conversation bubble switch if app bubbles are off
...
Fixes: 159340745
Test: BubblePreferenceControllerTest
Test: priority conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle checked
=> app bubbles ON => toggle checked
Test: default/silent conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle NOT checked
=> app bubbles ON => toggle NOT checked
Change-Id: Ia5759c2a06c1da4d84b3dafed95e52c3aa30ad56
2020-08-14 20:18:26 +00:00
TreeHugger Robot
d16603ea0e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: 4c5836ae3c
-s ours am: ca7d97c2ce
-s ours am: f8324f7c9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: Ibcbdacfd574ec6c07aca62066784404137939cce
2020-08-14 17:25:22 +00:00
TreeHugger Robot
d85fdbc948
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: b7af3be0a2
-s ours am: 7d6ba6a253
-s ours am: 4014e3ec26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: I0d256df3810a2b1f3f59a3e0dd5a8f504e2f69f0
2020-08-14 17:25:07 +00:00
TreeHugger Robot
f8324f7c9a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: 4c5836ae3c
-s ours am: ca7d97c2ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: I00f8ece4367e948498a767ac446ebee19befe283
2020-08-14 17:05:13 +00:00
TreeHugger Robot
4014e3ec26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: b7af3be0a2
-s ours am: 7d6ba6a253
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: Icf940c9d60a8ca15ad714d2ecad28e1bbb2b8264
2020-08-14 17:04:33 +00:00
TreeHugger Robot
ca7d97c2ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: 4c5836ae3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: I917a5e11c05def15c019110b1d9689ec562eb629
2020-08-14 16:41:39 +00:00
TreeHugger Robot
7d6ba6a253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: b7af3be0a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: Id4db9540e9efd78af00b5b68729c59b70803c043
2020-08-14 16:40:28 +00:00
TreeHugger Robot
4c5836ae3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: Iefc7c31c26740eddc63cb8a16604ea7102e7ad14
2020-08-14 16:23:58 +00:00
TreeHugger Robot
b7af3be0a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: Id3710c913387095a46dde8b67437b2f1e2d823e0
2020-08-14 16:22:21 +00:00
TreeHugger Robot
c9e69937bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-14 16:04:34 +00:00
Bill Yi
ff5cca6a6b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I241aeb3750d6a38ad8ed37f53ef5a75041501efe
2020-08-14 06:08:19 -07:00
TreeHugger Robot
9ab4df70cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3637a0c058
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375660
Change-Id: I0c95137f5f7bf8826ddd075ee64233c9e3ad0bb6
2020-08-14 11:12:13 +00:00
TreeHugger Robot
3637a0c058
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-08-14 10:55:59 +00:00
Bonian Chen
b184758c10
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
am: 45cc4bbe61
am: 454bcb012e
am: a716d48ffc
am: 6f5e9d1ee2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I412b79f476fcfbbb2536463fe0245a583eab9670
2020-08-14 09:30:23 +00:00
Bonian Chen
6f5e9d1ee2
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
am: 45cc4bbe61
am: 454bcb012e
am: a716d48ffc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I41e6a4e0604d9fe051fdb8168287c53a8da763c8
2020-08-14 09:13:01 +00:00
Bonian Chen
a716d48ffc
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
am: 45cc4bbe61
am: 454bcb012e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I2cdf575a7aeb63c28508578588ad36c8154428df
2020-08-14 08:56:55 +00:00
Bonian Chen
454bcb012e
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
am: 45cc4bbe61
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I65d1b2561a86542bd1cccd95f0e69b6b4ee594fe
2020-08-14 08:41:51 +00:00