Automerger Merge Worker
a79a396077
Merge "Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a am: 0add12ea08" into rvc-qpr-dev-plus-aosp
2020-06-02 07:40:57 +00:00
TreeHugger Robot
119a601a84
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a am: 0add12ea08
...
Original change: undetermined
Change-Id: I9579d362ed06d64949472e7b86193e0fea6ac0ac
2020-06-02 07:40:52 +00:00
TreeHugger Robot
7c99712340
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 723aeb0372
...
Original change: undetermined
Change-Id: Ie6dfb2bab7dd0d048f5692ade7e35b9ca1b70490
2020-06-02 07:40:50 +00:00
TreeHugger Robot
dca77b296a
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 0ee853f913
...
Original change: undetermined
Change-Id: Id668ed7383cd23220d19fef5576b33c7d5d91ecc
2020-06-02 07:40:03 +00:00
TreeHugger Robot
0add12ea08
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a
...
Original change: undetermined
Change-Id: I6a8b45fce1f7ab596648d50ba44395b05791e6ec
2020-06-02 07:22:37 +00:00
TreeHugger Robot
0ee853f913
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331
...
Original change: undetermined
Change-Id: Ieb42225de9670cef1a4436993112bb4e33ee5cb0
2020-06-02 07:22:18 +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
d73d9d616a
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0
...
Original change: undetermined
Change-Id: I75084fc3e3e8828a19eb2f0f68d83d3479258715
2020-06-02 07:08:57 +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
Automerger Merge Worker
abb6196e97
Merge "Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97" into rvc-d1-dev-plus-aosp am: 927dde84dc
...
Original change: undetermined
Change-Id: I415a3591e7ed7e6b2abb84feb7042fd013d5f151
2020-06-02 05:47:45 +00:00
TreeHugger Robot
1368e2f2b1
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 5a26d93586 am: 5b24a76730
...
Original change: undetermined
Change-Id: I055d5bbdd4dcb93ef0eada9aa23099d0fea7212b
2020-06-02 05:47:12 +00:00
TreeHugger Robot
d2cce375da
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97 am: 6860c7a713
...
Original change: undetermined
Change-Id: Ieb850c029053037602e9dabed815a765486cefe2
2020-06-02 05:46:56 +00:00
Automerger Merge Worker
927dde84dc
Merge "Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97" into rvc-d1-dev-plus-aosp
2020-06-02 05:34:46 +00:00
TreeHugger Robot
03ef7910d4
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97
...
Original change: undetermined
Change-Id: I58b9d9454f34937a32a864a75535a399cfa0359e
2020-06-02 05:34:40 +00:00
TreeHugger Robot
5b24a76730
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 5a26d93586
...
Original change: undetermined
Change-Id: Ie6c07254f20330919dbcf82f1c5578d1e7cda923
2020-06-02 05:34:29 +00: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
5a26d93586
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150
...
Original change: undetermined
Change-Id: Ibe50151938748666a1ad373846dae781e5354037
2020-06-02 05:22:20 +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
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
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
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
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
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
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