Automerger Merge Worker
bbb3f97c67
Merge "Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: 8dcfaf6aed" into rvc-qpr-dev-plus-aosp am: e8a45fce5a am: 4e8e19a68c
...
Original change: undetermined
Change-Id: I10dc0889fa6872c7808f6bf5e08cb3957a0e616e
2020-06-02 04:33:41 +00:00
TreeHugger Robot
02b3603ccb
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 2ccd3894ec am: 63bdcc8917 am: 19dae257da am: 54828982c4
...
Original change: undetermined
Change-Id: I0c36dfba3131f91ee50ca11d2026c742789f2385
2020-06-02 04:33:15 +00:00
TreeHugger Robot
c5ec6a0a5d
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: cda812d38c am: 5c10ddbaca am: 546d30ae54
...
Original change: undetermined
Change-Id: I2115cf6d11cadcea01ce48a74f51fa84a8e33e00
2020-06-02 04:32:49 +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
eb670aaf86
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888 am: 63a4d797ad am: 42fd0f82cb
...
Original change: undetermined
Change-Id: I58319d4177a8f51f61e83912c5a59990cb706e52
2020-06-02 04:32:43 +00:00
TreeHugger Robot
1f4e98bb29
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888 am: 02f56c1fde am: f8c35257a6
...
Original change: undetermined
Change-Id: I365194ea03d53cf406be000c1973efa441c42e57
2020-06-02 04:32:35 +00:00
TreeHugger Robot
68d2ace47c
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888 am: 02f56c1fde am: cc848eba1c
...
Original change: undetermined
Change-Id: I51c1becb3bbcfa03fbd43125096dfa0b6b6ed03f
2020-06-02 04:32:11 +00:00
Automerger Merge Worker
4e8e19a68c
Merge "Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: 8dcfaf6aed" into rvc-qpr-dev-plus-aosp am: e8a45fce5a
...
Original change: undetermined
Change-Id: I31d95578583ac00e4c3f876e2c16fba8e01c7779
2020-06-02 04:20:38 +00:00
TreeHugger Robot
42fd0f82cb
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888 am: 63a4d797ad
...
Original change: undetermined
Change-Id: I716c3a3f3471c9bcfc0225bbf85e364bdf0139e2
2020-06-02 04:20:21 +00:00
TreeHugger Robot
54828982c4
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 2ccd3894ec am: 63bdcc8917 am: 19dae257da
...
Original change: undetermined
Change-Id: Ie0b2acc6c959adcb152960907cfabc83a923d232
2020-06-02 04:20:15 +00:00
TreeHugger Robot
f8c35257a6
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888 am: 02f56c1fde
...
Original change: undetermined
Change-Id: Id89d7143bc944ff4c8eb8453b36aeaa0c0513862
2020-06-02 04:19:39 +00: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
546d30ae54
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: cda812d38c am: 5c10ddbaca
...
Original change: undetermined
Change-Id: I33b3772b8ce89dd5a909d2f17a152212802c427a
2020-06-02 04:19:26 +00:00
TreeHugger Robot
63a4d797ad
Merge "Remove High usage battery tip from Settings homepage." into rvc-dev am: 0886e90888
...
Original change: undetermined
Change-Id: I97a953796693c9406dbe6084c2553251ccb4b66f
2020-06-02 04:07:47 +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
Automerger Merge Worker
e8a45fce5a
Merge "Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: 8dcfaf6aed" into rvc-qpr-dev-plus-aosp
2020-06-02 04:01:26 +00:00
TreeHugger Robot
a1c9f04014
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: 8dcfaf6aed
...
Original change: undetermined
Change-Id: I412bc9834f81c7a98c0501afbff31a1af9e4506a
2020-06-02 04:01:21 +00:00
TreeHugger Robot
19dae257da
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 2ccd3894ec am: 63bdcc8917
...
Original change: undetermined
Change-Id: I43ba5deea5d1e76604ad17fdf82f89d1e7564206
2020-06-02 04:01:18 +00:00
TreeHugger Robot
5c10ddbaca
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa am: cda812d38c
...
Original change: undetermined
Change-Id: Id18722c54064e749fcdf68ceff58d9f15534844e
2020-06-02 04:01:01 +00:00
SongFerng Wang
05240c8b11
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8 am: 937ade12f5 am: 4cba1cc95f am: 7f26c6ac98
...
Original change: undetermined
Change-Id: I5c8fdcf0ca04d192e737ae678d2fb342f6e55514
2020-06-02 03:57:52 +00:00
SongFerng Wang
aca1a293c8
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 8b7fd29cda am: 7968f2e411 am: a66ad02a59 am: 3f66051610
...
Original change: undetermined
Change-Id: If40f4e795b8f77de87dae61e9c6e48571fa7d096
2020-06-02 03:57:06 +00:00
SongFerng Wang
6fa5a1aea0
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8 am: a8bdcaf0da am: 12a63a284f am: 040803eeec
...
Original change: undetermined
Change-Id: I9ca3d403592292e6da39f8b678667e1ab828f3be
2020-06-02 03:55:59 +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
63bdcc8917
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 2ccd3894ec
...
Original change: undetermined
Change-Id: I367c378b15d036ea2101e66ea43964a685645015
2020-06-02 03:48:38 +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
cda812d38c
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa
...
Original change: undetermined
Change-Id: Id3d215f8940c26d49047774c58c9fdc7dc57ad88
2020-06-02 03:47:52 +00:00
SongFerng Wang
7f26c6ac98
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8 am: 937ade12f5 am: 4cba1cc95f
...
Original change: undetermined
Change-Id: Ib4670b2baf4fd053f910f50d8444616ea1ebab6b
2020-06-02 03:43:18 +00:00
SongFerng Wang
3f66051610
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 8b7fd29cda am: 7968f2e411 am: a66ad02a59
...
Original change: undetermined
Change-Id: I8dd6761a9aba1b9123c853441cffc0ba78111400
2020-06-02 03:42:46 +00:00
SongFerng Wang
040803eeec
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8 am: a8bdcaf0da am: 12a63a284f
...
Original change: undetermined
Change-Id: I0daf8a547fbfda674e20fe5eba731478ada83e6d
2020-06-02 03:42:15 +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
2ccd3894ec
Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f
...
Original change: undetermined
Change-Id: Ia95e0ed78fbb5ca13220d4d6ef5aaa1ea9a57a21
2020-06-02 03:34:53 +00:00
SongFerng Wang
4cba1cc95f
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8 am: 937ade12f5
...
Original change: undetermined
Change-Id: I0f8073f47b36203fbfa6a2af2084e4c8636f0b44
2020-06-02 03:30:07 +00:00
SongFerng Wang
a66ad02a59
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 8b7fd29cda am: 7968f2e411
...
Original change: undetermined
Change-Id: I19841cb59b6719869fe3979428ef6286cf831c0b
2020-06-02 03:29:54 +00:00
SongFerng Wang
12a63a284f
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8 am: a8bdcaf0da
...
Original change: undetermined
Change-Id: Id2e283036a2a1e160c146bc70b98d6e2b4c9b669
2020-06-02 03:29:48 +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
7968f2e411
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 8b7fd29cda
...
Original change: undetermined
Change-Id: Ifadd1c052d8bc9b52c2cea994bb7352fa44fd0fa
2020-06-02 03:21:00 +00:00
SongFerng Wang
a8bdcaf0da
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e am: 6bb9afede8
...
Original change: undetermined
Change-Id: I8ab56ae1365b0692de6a2ce73408fe431921b85d
2020-06-02 03:20:15 +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
8b7fd29cda
Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev am: 4432ac9c7e
...
Original change: undetermined
Change-Id: Iff186c54542c52265798a66b6f153082fa10bcee
2020-06-02 03:07:09 +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
51266f38a0
Merge "Some text polish" into rvc-dev am: 56c820fb65 am: c4bb2eaf53 am: 0cbca70f12 am: c63645b1d8 am: 5750ee88cb
...
Original change: undetermined
Change-Id: I726a37333e2a7e30c8239ff341a9d8e5f8ac05c3
2020-06-02 00:05:15 +00:00
Robert Luo
77c52d11b4
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev am: 42b884eb91 am: feb1b6b6b1 am: 9c631f44b6 am: 785e2e05b7 am: 1c08eb5de4
...
Original change: undetermined
Change-Id: Ib84292e6a851489d9b80c995c264881549370489
2020-06-02 00:05:08 +00:00
TreeHugger Robot
215496fd8d
Merge "Some text polish" into rvc-dev am: 56c820fb65 am: f349972f5a am: f342494abd am: 7f794d82d8 am: 41538b0c9f
...
Original change: undetermined
Change-Id: I80b5d56580a620fe260a98e5d60b9ea7fb63b391
2020-06-02 00:05:01 +00:00
TreeHugger Robot
2c9cc6c883
Merge "Some text polish" into rvc-dev am: 56c820fb65 am: f349972f5a am: e7f26c600f am: 22f0d13bff am: 7ecabba8d7
...
Original change: undetermined
Change-Id: If2f2259b5b2f916b6c20891fa6e8596fd632f620
2020-06-02 00:04:54 +00:00
Robert Luo
b185557bc8
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev am: 42b884eb91 am: 12df24bba8 am: c4be4c75f6 am: fe36db5feb am: b3072dbba9
...
Original change: undetermined
Change-Id: Ide6aa19edeaffbf268f2fdd0117ae35aa2e35d23
2020-06-02 00:04:41 +00:00
Robert Luo
28d16a282f
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev am: 42b884eb91 am: 12df24bba8 am: 13c5d4a3a3 am: cd08030af8 am: ed0366a084
...
Original change: undetermined
Change-Id: I7eb95ef8347bb6cf793e122174a42c845d1128fc
2020-06-02 00:04:28 +00:00
TreeHugger Robot
5750ee88cb
Merge "Some text polish" into rvc-dev am: 56c820fb65 am: c4bb2eaf53 am: 0cbca70f12 am: c63645b1d8
...
Original change: undetermined
Change-Id: I56d4bc8ddf3639c0f2efc06070487ee90facd06d
2020-06-01 23:52:55 +00:00
Robert Luo
1c08eb5de4
Merge "Fix RTL alignment issue in the "How it works" page of Contactless payment settings" into rvc-dev am: 42b884eb91 am: feb1b6b6b1 am: 9c631f44b6 am: 785e2e05b7
...
Original change: undetermined
Change-Id: I23dd5f2e7506047d74779359443d355cb04e6937
2020-06-01 23:52:34 +00:00
