Commit Graph

75931 Commits

Author SHA1 Message Date
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
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
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
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
51f80cb3ed Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev 2020-08-15 01:56:05 +00: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
Bonian Chen
45cc4bbe61 Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 am: af57413abc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I1e5921c9a4cc5b223d0ee61eae2cac7afaa19e2a
2020-08-14 08:20:48 +00:00
Bonian Chen
af57413abc Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I5617a1d70e38aa39ec37ace07bce0d5fda699729
2020-08-14 08:05:12 +00:00
Bill Yi
1a66ef0ee0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: c0e5d4d545 -s ours am: d59705b1ea -s ours am: 8e27cecb22 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: If7be930b93d53cf9446641b9b83ffa0e43082347
2020-08-14 08:04:55 +00:00
Bill Yi
c470068d57 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: 83bf17ce56 -s ours am: 68e8b007c7 -s ours am: 883b66e181 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: I14cf291ed554bb18fa0126163fbab110d6bab9c7
2020-08-14 08:04:37 +00:00
TreeHugger Robot
a85bf20ee6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d -s ours am: 64462c12e6 -s ours am: e979ec36e0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375655

Change-Id: I7cdc59adbc872cf5509a658dabf79aae892468d4
2020-08-14 08:04:11 +00:00
Bill Yi
8e27cecb22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: c0e5d4d545 -s ours am: d59705b1ea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: I4b3079a3f2473ae79058d4d7d05ef9de750acd86
2020-08-14 07:48:03 +00:00
Bill Yi
883b66e181 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: 83bf17ce56 -s ours am: 68e8b007c7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: I0355ab50b8b17ebb5785ea2aa67b607401eaa2b0
2020-08-14 07:47:49 +00:00
TreeHugger Robot
e979ec36e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d -s ours am: 64462c12e6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375655

Change-Id: Ib3b7720a433ad3f080abf3fd52ce7267d486f57b
2020-08-14 07:47:35 +00:00
Bonian Chen
33e4971820 Merge "[Settings] Grant permissions to submit junit test" 2020-08-14 07:45:50 +00:00
Bill Yi
d59705b1ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: c0e5d4d545 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: Ia4ee8a0a2e7a5aefb1d3c17f945baeb93c4e5568
2020-08-14 07:37:00 +00:00
Bill Yi
68e8b007c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: 83bf17ce56 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: Ie8139461fd967bfbea45342178e4db58a2a3f147
2020-08-14 07:29:10 +00:00
TreeHugger Robot
64462c12e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375655

Change-Id: I460a8c803884d60adec281729d09372aab9122c0
2020-08-14 07:29:03 +00:00
Bill Yi
83bf17ce56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: I74ad57626a98bd94ea5d988b4f882a724040d3ab
2020-08-14 07:20:25 +00:00
Bill Yi
c0e5d4d545 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648

Change-Id: I191732742fe617ce8584ae1dffd345c4e7985843
2020-08-14 07:19:04 +00:00
TreeHugger Robot
18e427260d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-14 07:18:13 +00:00
Bill Yi
dcada837fd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic1db2e5dfc7ba4582fab1d75041627996a4213d3
2020-08-14 06:10:25 +00:00
Bill Yi
6415c5b511 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If17aadb947be94b348718f1cfb72d743468df69c
2020-08-14 05:02:26 +00:00
Bill Yi
5512b2f2dc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6385dcbd99493b0ccc9e8dff10e42bc738dd3c13
2020-08-14 04:27:09 +00:00