Commit Graph

62440 Commits

Author SHA1 Message Date
Stanley Wang
d17f33c675 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c
Change-Id: Ie3a0270c31d3f90efd6df5dcd4dbe40d11305bb6
2020-03-27 03:41:42 +00:00
Stanley Wang
05edaa9f2f Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 06cecd534b
Change-Id: Ib881ec3a58971098d81218085a95d5ac696a6845
2020-03-27 03:41:35 +00:00
Automerger Merge Worker
6384124e6b Merge "Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3" into rvc-d1-dev-plus-aosp 2020-03-27 03:41:15 +00:00
TreeHugger Robot
96a39bdc8b Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3
Change-Id: I82e2b74170df4f971c9f11520e7f9450940cc9b1
2020-03-27 03:41:11 +00:00
TreeHugger Robot
97ac18af4e Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 35adcca607
Change-Id: Iff0c0c929a0619136585ded70a975f3777c55c01
2020-03-27 03:41:09 +00:00
TreeHugger Robot
9a7d5e058a Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3
Change-Id: I9a1ae7b561196f5a518fd38cbf7ed6429fe647db
2020-03-27 03:41:05 +00:00
Stanley Wang
06cecd534b Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de
Change-Id: Ic0ed3b423535e29aa54bbe89779ca46e1529f2c6
2020-03-27 03:29:19 +00:00
Stanley Wang
3ce4e5171c Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de
Change-Id: I6fa862418dd602dd000796b4a3ca28df241204be
2020-03-27 03:28:49 +00:00
TreeHugger Robot
35adcca607 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
Change-Id: Ida02e3e49ab0210d8494d6e919b5048895f1eae0
2020-03-27 03:28:47 +00:00
TreeHugger Robot
5399c512f3 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
Change-Id: I47a54efbdbcb2b052cd4ba04881630109bd7dd52
2020-03-27 03:28:19 +00:00
Stanley Wang
b97e3163de Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
Change-Id: I033881dc09b05940f3bf5915de8df09e7c4f762c
2020-03-27 03:20:50 +00:00
TreeHugger Robot
b11a46cfd5 Merge "Update customize button title when state changed" into rvc-dev 2020-03-27 03:17:25 +00:00
Stanley Wang
0b76ef19b5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev 2020-03-27 03:09:09 +00:00
Raff Tsai
2a295fbc12 Add TradeFed test config to SettingsPerfTests
Bug: 145109184
Test: rebuild
Change-Id: Ib21e96c4588583826e363b0a89c23692ac677fe0
2020-03-27 10:15:40 +08:00
James.cf Lin
9f8edf2b67 Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type
After setting the network to telephony framework, Setting UI didn't check this network type when show on the UI and show the invalid string.

Bug: 152373426
Test: manual
Change-Id: Ibf280a9905edcb7bd241a1505e85ac5e83993634
2020-03-27 09:54:08 +08:00
Philip P. Moltmann
26551165d3 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2 am: 211c103a2a
Change-Id: Ia4288ecc0ca1ea1b746f20f6d482679e58d35bc5
2020-03-27 01:33:44 +00:00
Xiangyu/Malcolm Chen
1da1106869 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab am: 7ddf390f0f
Change-Id: Ic2af4512bc4736acb7231856e5dc6632759672e7
2020-03-27 01:33:08 +00:00
Philip P. Moltmann
6ed0278e1f Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7 am: 6ce4efc2a1
Change-Id: I80484612731766437a9241c0aad6ecb3b8924100
2020-03-27 01:22:42 +00:00
Philip P. Moltmann
211c103a2a Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2
Change-Id: I2e23ce74d9a69d7f0f1bc55cda579288c222795f
2020-03-27 01:22:23 +00:00
Philip P. Moltmann
b8e47e2ad5 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 716ff8c256
Change-Id: I84eeb20ce13d2d5139a7deb6c00ddad83cda6bc6
2020-03-27 01:21:47 +00:00
Xiangyu/Malcolm Chen
7ddf390f0f Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab
Change-Id: If3589146aa20756db9696b98e12e1ba68ba68d5c
2020-03-27 01:21:04 +00:00
Automerger Merge Worker
f0def7ceaf Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp am: 17ec2206f3
Change-Id: Ib19b6434590732f77b36c2f6a929dc11dbaa57dd
2020-03-27 01:18:34 +00:00
Xiangyu/Malcolm Chen
e9b0810465 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 90f9b73775
Change-Id: I01062a8b381ee5cf318ee4912905f7e49d5548a3
2020-03-27 01:16:37 +00:00
Philip P. Moltmann
370b7006f2 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d
Change-Id: I438f78f5935a60fc32bc620cde6b5591e4b12c26
2020-03-27 01:10:08 +00:00
Xiangyu/Malcolm Chen
7dd9a37fab Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb
Change-Id: I66bd7594261e21af7bbc235c70cabb7d327e0a3f
2020-03-27 01:07:14 +00:00
Philip P. Moltmann
6ce4efc2a1 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7
Change-Id: I1fa90dc38669d315f63405a2f14deab2ed906dab
2020-03-27 00:59:51 +00:00
Philip P. Moltmann
716ff8c256 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d
Change-Id: Ie7713b153c189a48770f91d85e6b4562d7bd1842
2020-03-27 00:59:36 +00:00
Automerger Merge Worker
17ec2206f3 Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp 2020-03-27 00:58:34 +00:00
Xiangyu/Malcolm Chen
a99132ab3a Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531
Change-Id: Iaaf9a087b05d493b1b53a219d9cab9ca6398998c
2020-03-27 00:58:27 +00:00
Xiangyu/Malcolm Chen
90f9b73775 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb
Change-Id: If6e8b2f0b0e6b4031bf850577849ce4bbdf6fede
2020-03-27 00:58:12 +00:00
Philip P. Moltmann
e7466934b7 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4
Change-Id: I3a36b7b0561cb630c115e000294e32fe378a94a1
2020-03-27 00:47:23 +00:00
Philip P. Moltmann
d96297e82d Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4
Change-Id: If69c166859f3f8869154c457a6ae8d5985716de5
2020-03-27 00:46:56 +00:00
Xiangyu/Malcolm Chen
0e4d8aa531 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
Change-Id: Id7cec642292dab8ec19bb33ab8247d7f3b0d2865
2020-03-27 00:44:30 +00:00
Xiangyu/Malcolm Chen
0358e150fb Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
Change-Id: Ib32c94a0f464aa0f95a73611b833664313c48b16
2020-03-27 00:44:04 +00:00
Philip P. Moltmann
1e812204e4 Merge "Only check op in Settings UI" into rvc-dev 2020-03-27 00:25:38 +00:00
Xiangyu/Malcolm Chen
b0a5905d08 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev 2020-03-27 00:24:23 +00:00
TreeHugger Robot
1022701794 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 9c7c2f8187 am: 0192f27094
Change-Id: I4cf13e2f1fd4374cec8bbca1bb25cab580655860
2020-03-26 22:09:54 +00:00
TreeHugger Robot
0a6c73e3bd Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 908fff9099 am: a93ba8895e
Change-Id: I50c3c982de1b46c37fed6dede432853b8c288164
2020-03-26 22:00:25 +00:00
TreeHugger Robot
ea2948eaaa Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 23188466eb
Change-Id: I8206d4655aacb380376afc25c1f646f18d589415
2020-03-26 21:59:10 +00:00
TreeHugger Robot
0192f27094 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 9c7c2f8187
Change-Id: Iaecb9b15a4cb3b754081f856a3203d793323cb4a
2020-03-26 21:58:27 +00:00
TreeHugger Robot
a93ba8895e Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 908fff9099
Change-Id: I2cf85a16e67b131c5383283dcff291a74d80f9d8
2020-03-26 21:18:34 +00:00
TreeHugger Robot
9c7c2f8187 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd
Change-Id: I437c5ad834486bfe720bfe67cf2c05b844ef3e45
2020-03-26 21:18:23 +00:00
TreeHugger Robot
23188466eb Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd
Change-Id: I768ea3ffd82421631d17f04cf3d857cc8250da08
2020-03-26 21:18:13 +00:00
TreeHugger Robot
300b3742fd Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
Change-Id: If875b3ad36863daff5e408a142caade2b44a3f18
2020-03-26 21:06:31 +00:00
TreeHugger Robot
908fff9099 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
Change-Id: Ibc83796466da9e39440c205d47ba059b4908175f
2020-03-26 21:06:30 +00:00
TreeHugger Robot
7440bf7034 Merge "DND Bypassing Apps redesign" into rvc-dev 2020-03-26 20:54:33 +00:00
Beverly
37462ff959 Add mocked main looper to test
Toasts were updated in frameworks/base and now will try to get
the main looper when trying to create an AccesssibilityManager. Add this
mock to avoid a null pointer when trying to post a ShadowToast.

Fixes: 151844983
Test: atest make RunSettingsRoboTests7
Change-Id: I4cb6fe44506097b52ce1bb0c8ae7a502d0901f64
2020-03-26 16:26:44 -04:00
Malcolm Chen
b5e7565175 Show footer to notify user no 5G in DSDS mode.
Bug: 151657272
Test: manual and robotests
Change-Id: I5df95528aae12b43a15389b8048f14d9508272f3
2020-03-26 10:31:42 -07:00
Beverly
f707950ee7 DND Bypassing Apps redesign
- Add link in DND Conversations Page to the overall conversations list
Settings page
- Add custom_rule xml pages for custom schedule rule settings for
messages and calls (so the UI is the same as before the message/calls
redesign)
- Change app exceptions to display apps with subtext indicating which
notitfication channels are allowed to bypass dnd (previously, would
display each channel individually)
- Add individual AppBypassDnd channel pages where users can decide which
channels will bypass DND for an app on a single page
(AppChannelsBypassingDndSettings)
- Only remove dnd bypassing apps preferences from the preference list if the list changed,
else just update the preference itself to avoid the list from flashing

Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: If12d8921e1405aefb1066acc2ef5c55d216fe47a
2020-03-26 16:49:17 +00:00
TreeHugger Robot
d89dda533b Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: cff829902d am: b1fffc6071
Change-Id: Idbbbbb6b6a61724146faf56357420c21acd07ba1
2020-03-26 16:11:06 +00:00