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
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
TreeHugger Robot
c39eecf9f8
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
am: ad90366eef
am: e7061f6436
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: I5e805b679bc3b95ac38987c08ce57bf3969520b0
2020-07-08 18:47:29 +00:00
TreeHugger Robot
81239defba
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
am: ad90366eef
am: 76c4de9b32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: Ibf5541ee46d1465a941e80d5a25e9e553322429c
2020-07-08 18:46:24 +00:00
TreeHugger Robot
f98da80c18
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
am: ba3131d923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: If4199557cbcad3dfd1eec19eb52fcf0cf0a094a9
2020-07-08 18:34:47 +00:00
TreeHugger Robot
e7061f6436
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
am: ad90366eef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: I7f637520c29177dbd60fabbef6c27f0eb195c51f
2020-07-08 18:33:51 +00:00
TreeHugger Robot
76c4de9b32
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
am: ad90366eef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: I68fc9122aa6ae1f98f57ef41503aee9be46d2269
2020-07-08 18:33:46 +00:00
TreeHugger Robot
ba3131d923
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: I5a022bd9d9b9485f9caf10c42f7146d35660da0a
2020-07-08 18:22:18 +00:00
TreeHugger Robot
ad90366eef
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: I1319699912f7b7d332c0680670598179b5f8b522
2020-07-08 18:22:00 +00:00
TreeHugger Robot
28a5c00429
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev
2020-07-08 18:09:09 +00:00
TreeHugger Robot
864ae39cbe
Merge "Replace zen setting plurals with MessageFormat"
2020-07-08 15:33:39 +00:00
Abhijeet Kaur
7c737822d6
Remove Settings fuse flag as the change is now stable
...
Bug: 160159282
Test: Fuse flag does not show up in Settings -> Feature flags
Change-Id: I9ae8fcc0e10cba4b6a0887f6960cf9671b1a6b38
2020-07-08 13:22:20 +01:00
Jason Chiu
eaf1564d9f
Guard against SecurityException of accessing to slice uri
...
- Sometimes unregistering a Slice callback will have no permission to
unpin the Slice uri and throw an exception.
- Guard against the exception as the first solution.
Bug: 159722324
Test: robotest
Change-Id: Ic227331fef64c3fa6fe3e4442fba2a9b754d520d
2020-07-08 11:28:33 +00:00
TreeHugger Robot
4395ef199a
Merge "Import translations. DO NOT MERGE"
2020-07-07 14:55:38 +00:00
TreeHugger Robot
7d98a8864d
Merge "Import translations. DO NOT MERGE"
2020-07-07 14:34:08 +00:00
Bill Yi
25391a53b8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I596ca93a936f8e35d96db7b631d19fb7eb2a4492
2020-07-07 04:29:06 -07:00
Bill Yi
971aef27ce
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: If57d8e1c893578e717af75b6cb0217b34be9b03e
2020-07-07 03:45:37 -07:00
TreeHugger Robot
5e1fb41ffe
Merge "New settings preference to swipe bottom for notification"
2020-07-07 02:02:12 +00:00
TreeHugger Robot
7640254e76
Merge "Adjust Slice title icon size on Output Switcher panel for new AndroidX library"
2020-07-07 01:29:58 +00:00
Automerger Merge Worker
e1b678d139
Merge "Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
am: f2c65caa4c" into rvc-qpr-dev-plus-aosp am: 496f19f0b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I666eb704531e156c211ae0e9ccdafe09d598aefb
2020-07-06 19:39:58 +00:00
Zhen Zhang
b96eb8e150
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: 07edb930c2
am: f7bfd800ad
am: 1397e7db4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: Icad10aae2662f907a1d70a1349060c2cb4ccb3f5
2020-07-06 19:39:36 +00:00
Zhen Zhang
0b51df70c7
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
am: 29433c163d
am: d3b7566f29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I4bc66c2909e4c18a65cf93bd2c1f34d4675f06cc
2020-07-06 19:39:09 +00:00
Automerger Merge Worker
496f19f0b3
Merge "Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
am: f2c65caa4c" into rvc-qpr-dev-plus-aosp
2020-07-06 19:28:32 +00:00
Zhen Zhang
3604372c4f
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
am: f2c65caa4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: Id2b7510215e9264b2c2e595a92e92834aa42296e
2020-07-06 19:28:28 +00:00
Zhen Zhang
1397e7db4e
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: 07edb930c2
am: f7bfd800ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: Idd1fcc6d21a7705db333ea7ccc830c2519bd6725
2020-07-06 19:28:23 +00:00
Zhen Zhang
d3b7566f29
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
am: 29433c163d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I51fa6971340d4f91ccf75491def670e41c45277f
2020-07-06 19:28:06 +00:00
Zhen Zhang
f2c65caa4c
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I20c9dc4af83fdf232db45990617c49d2283ad88f
2020-07-06 19:17:44 +00:00
Zhen Zhang
f7bfd800ad
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: 07edb930c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: If2a257fe0f8e044eb7a816f1c3e1a183b1d3f5b4
2020-07-06 19:17:40 +00:00
Zhen Zhang
29433c163d
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
am: c570eb8c9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: If6b249b1a028de832228c146982e4397addac95c
2020-07-06 19:17:26 +00:00
Zhen Zhang
07edb930c2
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I375e6de0cfa3c6c0e2cbc0110194352885379e72
2020-07-06 19:04:54 +00:00
Zhen Zhang
c570eb8c9a
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I5b0fbdb7f52f6570f273bc4510cd0fdecf2f7a63
2020-07-06 19:04:48 +00:00
Zhen Zhang
05ae65b7b0
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev
2020-07-06 18:54:47 +00:00
Beverly
c549280a33
Replace zen setting plurals with MessageFormat
...
For better translations. See go/android-i18n-plurals.
Test: manual
Test: make RunSettingsRoboTests7
Fixes: 156651436
Change-Id: Ic82140b81bf49f071291d2824fa45d310de238ae
2020-07-06 11:25:00 -04:00
TreeHugger Robot
9aa80727c4
Merge "Fix sketchy bubble preference button" into rvc-qpr-dev am: 031b9fe646
am: 0642f08479
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12061236
Change-Id: I9d0fc91fa3623b901855a03eea65a82bdee43751
2020-07-06 14:09:27 +00:00