Commit Graph

74332 Commits

Author SHA1 Message Date
Lyn Han
fc6ff9982f Merge "Vertical-center bubble preference button content" into rvc-qpr-dev am: 4d1ded8fba am: 3dc91fbf3a am: 3d1e9c2ea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12111422

Change-Id: Ie366ef67794476ba84117847438ee0d0d80c6022
2020-07-09 17:40:23 +00:00
Lyn Han
3d1e9c2ea1 Merge "Vertical-center bubble preference button content" into rvc-qpr-dev am: 4d1ded8fba am: 3dc91fbf3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12111422

Change-Id: I8fd955d2601b04093ec16afe63b269b18b7b4388
2020-07-09 17:28:05 +00:00
Lyn Han
3dc91fbf3a Merge "Vertical-center bubble preference button content" into rvc-qpr-dev am: 4d1ded8fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12111422

Change-Id: I68c23291fd3b10c034651dfcb75987946ceef7d7
2020-07-09 17:19:16 +00:00
Lyn Han
4d1ded8fba Merge "Vertical-center bubble preference button content" into rvc-qpr-dev 2020-07-09 17:04:47 +00:00
TreeHugger Robot
4eeb3f3221 Merge "Restore original importance when unblocking notif channel" am: 8a2468447b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12110451

Change-Id: If7841ef95a6fcb54264393b05570dd8aa18b7f66
2020-07-09 15:57:29 +00:00
TreeHugger Robot
8a2468447b Merge "Restore original importance when unblocking notif channel" 2020-07-09 15:47:01 +00:00
Abhijeet Kaur
f53a87844f Merge "Remove Settings fuse flag as the change is now stable" am: 5923e972f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108067

Change-Id: I393d11e940c62bee625dd1a6d6ea1f6d8505fe46
2020-07-09 13:20:56 +00:00
Abhijeet Kaur
5923e972f7 Merge "Remove Settings fuse flag as the change is now stable" 2020-07-09 13:11:15 +00:00
TreeHugger Robot
f8a865c6b3 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: dbcd0f22a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02e89ada7034b931fb4793e9b524456ad5d4ad32
2020-07-09 06:34:52 +00:00
TreeHugger Robot
feb0c8ed52 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: d9a15eb074 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50de4c799d6ca091d9bd114f50f6c93928cb0523
2020-07-09 06:34:40 +00:00
TreeHugger Robot
dbcd0f22a7 Merge "Import translations. DO NOT MERGE" 2020-07-09 06:24:50 +00:00
TreeHugger Robot
d9a15eb074 Merge "Import translations. DO NOT MERGE" 2020-07-09 06:24:11 +00:00
Bill Yi
de3c9a87f3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I7616dd32f4d8e00383064954588ff34aa6a2059c
2020-07-08 21:49:20 -07:00
Bill Yi
5817d75ea5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ieda95588c78e76685161102da8488a3090aeffd8
2020-07-08 21:05:40 -07:00
TreeHugger Robot
e5f68be015 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours am: 3879ddd019 -s ours am: fa15bdce72 -s ours am: 3b0d1dfd31 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c74a688e39aa33f4f386df68a4dd8e9514b0afd
2020-07-09 02:36:48 +00:00
TreeHugger Robot
acd2e8259d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours am: 520c876866 -s ours am: 6bf98f2598 -s ours am: e3f18c00f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa851ae2d18b059f64f02e288e68cf1072075187
2020-07-09 02:35:41 +00:00
TreeHugger Robot
3b0d1dfd31 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours am: 3879ddd019 -s ours am: fa15bdce72 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7433eefb1fce717619173590e4927ef30fd0b789
2020-07-09 02:23:12 +00:00
TreeHugger Robot
e3f18c00f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours am: 520c876866 -s ours am: 6bf98f2598 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20beeeee16da425f005ac3bec2c2fcf528330644
2020-07-09 02:23:00 +00:00
TreeHugger Robot
fa15bdce72 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours am: 3879ddd019 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id01abcbcc30ca6a528b7f18b3280ad66f68a628e
2020-07-09 02:11:25 +00:00
TreeHugger Robot
6bf98f2598 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours am: 520c876866 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4da1e8eaf82dd713c336872b46589bb80b56d9f
2020-07-09 02:11:09 +00:00
TreeHugger Robot
3879ddd019 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cf2ea38f98ac282d0387c0142967b60db9220ed
2020-07-09 02:00:01 +00:00
TreeHugger Robot
520c876866 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1801f5247e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55089ae35b7ca3241429ddfd09c1dcc5a0d445fa
2020-07-09 01:59:45 +00:00
TreeHugger Robot
1801f5247e Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-07-09 01:48:46 +00:00
Automerger Merge Worker
63b8ed3254 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 34f5e2c07c -s ours" into rvc-qpr-dev-plus-aosp am: f4e887de70 -s ours am: 6619dcc3dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1242d413ba4b99291762ccf067d9e3f8af2fef6
2020-07-09 01:35:40 +00:00
TreeHugger Robot
c5a3b8fd9e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: b45f7f11ad -s ours am: c372c3fa75 -s ours am: 0e1637243b -s ours am: 5f9c6ff100 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20f4b3e110b18ea84d016d4d27733743b67f0618
2020-07-09 01:35:27 +00:00
TreeHugger Robot
4520141765 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 6b23bcd265 -s ours am: 0928eccc52 -s ours am: d67af4c4bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6eaefd63285ab7cab2b0bfc14a6e9cfeb174ace
2020-07-09 01:35:15 +00:00
Automerger Merge Worker
6619dcc3dd Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 34f5e2c07c -s ours" into rvc-qpr-dev-plus-aosp am: f4e887de70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a3c1d251f0b0c33b4c3a94cf59237d1669048ea
2020-07-09 01:22:54 +00:00
TreeHugger Robot
5f9c6ff100 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: b45f7f11ad -s ours am: c372c3fa75 -s ours am: 0e1637243b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id71486f7d51f6cc03760b34a7fc6e27405247e60
2020-07-09 01:22:41 +00:00
TreeHugger Robot
d67af4c4bf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 6b23bcd265 -s ours am: 0928eccc52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I525697e1ce6ac54a0a6aeb51ad0a506e5ef743c5
2020-07-09 01:22:19 +00:00
Automerger Merge Worker
f4e887de70 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 34f5e2c07c -s ours" into rvc-qpr-dev-plus-aosp 2020-07-09 01:12:23 +00:00
TreeHugger Robot
e5db78285c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 34f5e2c07c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb06358755da4c7868a5eb8251be655fc26a8a3d
2020-07-09 01:12:20 +00:00
TreeHugger Robot
0e1637243b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: b45f7f11ad -s ours am: c372c3fa75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I549f4924045bf6ba7013e9848c87b588f444337b
2020-07-09 01:12:10 +00:00
TreeHugger Robot
0928eccc52 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours am: 6b23bcd265 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8fba8189f83b6271202cde603e38ad091dc3b1f0
2020-07-09 01:12:02 +00:00
TreeHugger Robot
34f5e2c07c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e949f9513e50f1a5d5fa7773abc1fb6eb20dbcb
2020-07-09 01:01:23 +00:00
TreeHugger Robot
c372c3fa75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: b45f7f11ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1a239ae9db90d8c56d4d40aea4043614d0bad05
2020-07-09 01:01:23 +00:00
TreeHugger Robot
6b23bcd265 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours am: c385028769 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb04f412273c63661d6731e99b9fd752b67fadb2
2020-07-09 01:01:06 +00:00
TreeHugger Robot
b45f7f11ad [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I259e276344d338e617d76ec2eee2ce83c99193e9
2020-07-09 00:51:37 +00:00
TreeHugger Robot
c385028769 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2195f10ee28ab969e107a3e78631754986eed8eb
2020-07-09 00:51:22 +00:00
TreeHugger Robot
ce1c1d3767 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-07-09 00:44:15 +00:00
Bill Yi
1ca49e59f9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I6c8b22ec45953bd3cf1e59a93258a81f5cffe69b
2020-07-08 17:27:24 -07:00
Bill Yi
042f3d1bf5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I060d248cade273ee2298f9bac0b95ab64aed1689
2020-07-08 15:15:50 -07:00
Lyn Han
3527730a64 Vertical-center bubble preference button content
Fixes: 160517101
Test: manual
Change-Id: I7a6ed455125a655e1199be95d954821dea5e0ace
2020-07-08 20:59:25 +00:00
Julia Reynolds
e2a8266328 Restore original importance when unblocking notif channel
Test: atest
Bug: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
2020-07-08 15:09:41 -04:00
TreeHugger Robot
d7548e6bf3 Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ba3131d923 am: f98da80c18 am: 02aab96359 am: 3fe07266d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: If329a003b283826f786e4a3c66dbf080a0fcde9e
2020-07-08 19:07:58 +00:00
TreeHugger Robot
5bfa3bb26f Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ad90366eef am: e7061f6436 am: c39eecf9f8 am: 08a941241d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I55d642c0339b9db305a804f8c28b33e1f2fae25d
2020-07-08 19:07:50 +00:00
TreeHugger Robot
4112f5b8d4 Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ad90366eef am: 76c4de9b32 am: 81239defba am: 130199c8c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I4a49f08980c471537a226072048a5c45bd34614e
2020-07-08 19:07:25 +00:00
TreeHugger Robot
3fe07266d6 Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ba3131d923 am: f98da80c18 am: 02aab96359
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I9fc2928236d9e54ec690ce5732e472943a97227d
2020-07-08 18:55:38 +00:00
TreeHugger Robot
08a941241d Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ad90366eef am: e7061f6436 am: c39eecf9f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I97588905ebd8d7ddc5db59e666249221a559f6f8
2020-07-08 18:55:30 +00:00
TreeHugger Robot
130199c8c9 Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ad90366eef am: 76c4de9b32 am: 81239defba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I2e5a6a9fe2c86013c18e64880c97ad70436b25ed
2020-07-08 18:55:14 +00:00
TreeHugger Robot
02aab96359 Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ba3131d923 am: f98da80c18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I03f2f3a0011d79390b90a178d7833357bcd6aed9
2020-07-08 18:47:36 +00:00