TreeHugger Robot
b200003ca0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716969
Change-Id: Idc8c41f255c30c255a3f38c5cb24ea2eb7555809
2020-06-03 14:58:24 +00:00
TreeHugger Robot
ba824d0593
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-06-03 14:43:44 +00:00
TreeHugger Robot
7741b83a5a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f
-s ours am: 3998e37c08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511
Change-Id: Icbadd31c79dbd9109ec14c53c6a88aeeb1e960a8
2020-06-03 14:39:21 +00:00
TreeHugger Robot
3998e37c08
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11713511
Change-Id: I0f23e3a5bef0c7f719522c22eb2720380d64635d
2020-06-03 14:17:18 +00:00
TreeHugger Robot
879fba597f
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-03 14:07:12 +00:00
Julia Reynolds
09052ac8d9
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
am: 62814ac56f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I0a9776f57778db6ad94e77457033d15ff3415dd1
2020-06-03 11:49:47 +00:00
Julia Reynolds
62814ac56f
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I5776854796a31906783291df89ffea2559f6d4d3
2020-06-03 11:33:47 +00:00
Julia Reynolds
613e3c4065
Merge "Add entry point for conversation settings" into rvc-dev
2020-06-03 11:17:42 +00:00
Jakub Pawlowski
50f8ba28d6
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
am: 103cc7cf29
am: 3185f80f23
am: 330bf35b22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I88a9d5851fd510f74ad571f72079bec15c85cb13
2020-06-03 10:48:11 +00:00
Jakub Pawlowski
330bf35b22
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
am: 103cc7cf29
am: 3185f80f23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I613704afab8dc97bfc3d620120d82a6e76c893e9
2020-06-03 10:33:36 +00:00
Jakub Pawlowski
3185f80f23
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
am: 103cc7cf29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: Ifbdd0f3dabc0b487bfb5155f786cae6a9980557b
2020-06-03 10:18:46 +00:00
Jakub Pawlowski
103cc7cf29
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: Ib47c1804cbb29942c33152d72e1019c92f0d3856
2020-06-03 09:59:18 +00:00
Bill Yi
0b57acc540
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I5ac48806b2230173733c1fc11e6f863c490186ab
2020-06-03 09:56:40 +00:00
Bill Yi
8d76e4b239
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I0a2fedc5db15afabfe816ce0fe3499331cdccab6
2020-06-03 09:15:02 +00:00
Julia Reynolds
6a88e140fe
Add entry point for conversation settings
...
Test: manually launch to this screen
Bug: 155490513
Change-Id: I2f88ef6dc05f04249f516b60680a55d1f26841f1
2020-06-02 12:59:13 -04:00
Bonian Chen
68b19028ee
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77
am: 45382e75cf
...
Original change: undetermined
Change-Id: I7e136e9e2cc2e4ef76ec5fd9d31af7465659824e
2020-06-02 14:58:19 +00:00
Bonian Chen
45382e75cf
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77
...
Original change: undetermined
Change-Id: If32fcf027ee41cf60f0b6edade1b2468d2fe28ef
2020-06-02 14:46:23 +00:00
Bonian Chen
68cc44bb77
Merge "[Settings] Move mobile data template out of framework" into rvc-dev
2020-06-02 14:36:20 +00:00
Bonian Chen
27565c5f40
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2
am: ae207e14c0
...
Original change: undetermined
Change-Id: Icc9108b620e40439cde62110f69ebd1ee8670150
2020-06-02 09:42:53 +00:00
Bonian Chen
ae207e14c0
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2
...
Original change: undetermined
Change-Id: I92c00ccaca975dec09b57afbabdadffc26bbd355
2020-06-02 09:29:13 +00:00
Bonian Chen
db6309cae2
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev
2020-06-02 09:19:00 +00:00
Bonian Chen
d40f7f707e
[Settings] Move mobile data template out of framework
...
Move mobile data template out of framework
Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageLibTest
Change-Id: I5072cd1e673194d00b3ce82242bf5fbad88d23cd
2020-06-02 17:16:53 +08:00
TreeHugger Robot
660021fec1
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd
am: b607801762
...
Original change: undetermined
Change-Id: I45901cb1a991dfb65f4406b48a88506941ac44e4
2020-06-02 07:46:52 +00:00
TreeHugger Robot
b607801762
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd
...
Original change: undetermined
Change-Id: I33a30ec63b81285b76f07f51c4b139198fe24320
2020-06-02 07:33:43 +00:00
TreeHugger Robot
723aeb0372
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0
am: b05ab42331
...
Original change: undetermined
Change-Id: I00edcd1c5f37c99b1e6cb8ce1022f4635ac8d78e
2020-06-02 07:22:16 +00:00
TreeHugger Robot
62ec08f7bd
Merge "Suppress battery saver suggestion notification" into rvc-dev
2020-06-02 07:18:54 +00:00
TreeHugger Robot
b05ab42331
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0
...
Original change: undetermined
Change-Id: I2ff9f2d9ee2e33bb41bc5bfd43aee1153b819ee8
2020-06-02 07:08:10 +00:00
TreeHugger Robot
8ab31819e0
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev
2020-06-02 06:58:26 +00:00
Mill Chen
418c85f139
Suppress battery saver suggestion notification
...
When users turn on battery saver manually more than 3 times, the "Tap to
schedule Battery Saver" notification will suggest users to enable
scheduling battery saver. But this notification is still shown if users
have already turned on scheduling battery saver, which is caused by no
mechanism to suppress this notification.
Solution:
Adding a mechanism to suppress battery saver suggestion if users
scheduled battery saver.
Bug: 147862112
Test: robotests
Change-Id: I8290d76dac09104e64fb98b8a9f4d783a8177d7c
2020-06-02 13:50:48 +08:00
TreeHugger Robot
6860c7a713
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150
am: 193c30ae97
...
Original change: undetermined
Change-Id: I47fd7fabe06a7a46c5cc4a6bdb22b2a9e6d29e53
2020-06-02 05:33:52 +00:00
TreeHugger Robot
193c30ae97
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150
...
Original change: undetermined
Change-Id: Ie19397d30c0e0bf996e780e040a3e562e5f039c4
2020-06-02 05:22:18 +00:00
TreeHugger Robot
55b7890150
Merge "Fix contextual card robotests." into rvc-dev
2020-06-02 05:10:02 +00:00
Tsung-Mao Fang
f6841ef548
Add a setting for allowing overlays on Settings app
...
In the past, we allowed non system overlays on user-debug rom.
Acoording to the user-debug guildline, we should not have differnt
behavior between the user build and user debug rom.
To maintain the consistency between user and user debug rom,
We're creating a new developer setting for allowing non-system overlay on
Settings. By default, we don't allow any non-system app overlays on
Settings app unless user turns it on explictly.
Test: Run robotest. Turn on setting, see the overlays on Settings.
Turn off setting, do not see the overlays on Settings.
Fix: 144989059
Change-Id: I87f00a2eda91de003c6e542e7ec45a066f46fbf7
2020-06-02 12:32:43 +08:00
TreeHugger Robot
cc848eba1c
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888
am: 02f56c1fde
...
Original change: undetermined
Change-Id: If02a6d9a812fcfd2eccdb2400720856d81e68f57
2020-06-02 04:19:26 +00:00
TreeHugger Robot
02f56c1fde
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888
...
Original change: undetermined
Change-Id: I81bd3f028e1a2c94e4ae4dbaf19e2f4248d92d92
2020-06-02 04:07:45 +00:00
TreeHugger Robot
0886e90888
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev
2020-06-02 03:52:52 +00:00
TreeHugger Robot
8dcfaf6aed
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f
am: 363cd6e7fa
...
Original change: undetermined
Change-Id: I759e474ce368112f3ab9ba4d9bc95349e04eaf10
2020-06-02 03:48:05 +00:00
TreeHugger Robot
363cd6e7fa
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f
...
Original change: undetermined
Change-Id: I4290f9b198dd8078a386acffc38216d11ebe75d4
2020-06-02 03:34:56 +00:00
TreeHugger Robot
425f8d235f
Merge "Fix output switch will show empty slice" into rvc-dev
2020-06-02 03:22:19 +00:00
SongFerng Wang
937ade12f5
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e
am: 6bb9afede8
...
Original change: undetermined
Change-Id: I67e21803441287ea88dec9d930f528b22546f073
2020-06-02 03:20:03 +00:00
SongFerng Wang
6bb9afede8
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e
...
Original change: undetermined
Change-Id: I653e7aa705276189dcde7e16bc5d82ea6410b1ef
2020-06-02 03:07:41 +00:00
SongFerng Wang
4432ac9c7e
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev
2020-06-02 02:54:17 +00:00
Yi-Ling Chuang
5e082cb401
Fix contextual card robotests.
...
We have to set SUPPORTED_SPECS for slice to test.
Fixes: 157904094
Test: robotests
Change-Id: I9f8edd7232d772b2376d4e6ec1e4738bc01ee4aa
2020-06-02 10:21:24 +08:00
TreeHugger Robot
e7f26c600f
Merge "Some text polish" into rvc-dev am: 56c820fb65
am: f349972f5a
...
Original change: undetermined
Change-Id: Ie61773e2d6d9d01a25e2c5753f29054431a568bd
2020-06-01 23:17:46 +00:00
Robert Luo
c4be4c75f6
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev am: 42b884eb91
am: 12df24bba8
...
Original change: undetermined
Change-Id: I2c1e235293071382a44376594543d326672c11b7
2020-06-01 23:17:39 +00:00
TreeHugger Robot
f349972f5a
Merge "Some text polish" into rvc-dev am: 56c820fb65
...
Original change: undetermined
Change-Id: Ia8ca1f7e5977299de3515fa057e1cd22bf1dc359
2020-06-01 23:03:05 +00:00
Robert Luo
12df24bba8
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev am: 42b884eb91
...
Original change: undetermined
Change-Id: Ic2af605314e68cd2bc04869319e773495ba99a40
2020-06-01 23:02:50 +00:00
TreeHugger Robot
56c820fb65
Merge "Some text polish" into rvc-dev
2020-06-01 22:58:03 +00:00
Robert Luo
42b884eb91
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev
2020-06-01 22:47:43 +00:00
Fabian Kozynski
202d588676
Merge "Use PackageManager.FEATURE_CONTROLS to decide availability" into rvc-dev am: 43527ef8f4
am: 5a91550b9d
...
Change-Id: I26501bb2f4a85014264bc0c4385159aa0f08efab
2020-06-01 20:57:34 +00:00