PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,046 Commits 1 Branch 0 Tags
a398c998628716ac7e3301b596ef9cbb104ae7c9
Commit Graph

61046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a398c99862 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: c8458cb3b9 
Change-Id: Ief91d11f0067846f957bef3a40f404f8c67b1088
 2020-03-27 08:35:30 +00:00
TreeHugger Robot
62a29dcd4e Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 
Change-Id: I4751289b54ff8452186e8ead5cba1640916c4805
 2020-03-27 08:35:16 +00:00
TreeHugger Robot
c8458cb3b9 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 
Change-Id: I5f644060868b9880699d8b24593087e6d132db53
 2020-03-27 08:20:25 +00:00
TreeHugger Robot
5656d63f54 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 
Change-Id: I4b0cfc4d7f6739763340772d905ef56b9629f72d
 2020-03-27 08:20:09 +00:00
TreeHugger Robot
735fdba4f2 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev 2020-03-27 08:07:51 +00:00
Edgar Wang
158ca96558 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: 890fc578f8 
Change-Id: I7f42995e54f6025b36a1e61ea0c8859f371f9990
 2020-03-27 06:10:54 +00:00
Edgar Wang
1d1edc8737 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e 
Change-Id: I54572bfb11b5134ed69352e34eb8fb5a520c9290
 2020-03-27 06:10:46 +00:00
Edgar Wang
890fc578f8 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 
Change-Id: If1815f491e3824dfe75e2e677a4effbddb7f73fe
 2020-03-27 05:53:21 +00:00
Edgar Wang
eb6820393e Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 
Change-Id: Ibc0389101fac1dd531dbbe7c925cc1ff6160570f
 2020-03-27 05:53:15 +00:00
Edgar Wang
d981e24705 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev 2020-03-27 05:40:33 +00:00
Stanley Wang
59e55dfd03 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c 
Change-Id: I292e9afed86dcfebc35f947bac6ae50cfcdc6be9
 2020-03-27 03:41:43 +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
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
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
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
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
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
Automerger Merge Worker
ea7b3d94a8 Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp 2020-03-26 15:28:58 +00:00
TreeHugger Robot
3421f934c8 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1 
Change-Id: Ie02d655b3334da8e169a017f638f3c38bba034a3
 2020-03-26 15:28:47 +00:00
TreeHugger Robot
71791d7e02 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d 
Change-Id: I550cc778b65683cbf2aed3441db7270d00021213
 2020-03-26 15:28:26 +00:00
TreeHugger Robot
6b37d4d4f1 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c 
Change-Id: I8e2d6cf302840e650f19caf6290f49542bcdd5f0
 2020-03-26 15:05:36 +00:00
TreeHugger Robot
a3368c723d Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c 
Change-Id: I7fd91faca77022aa748fbfbc41a645260f31aedf
 2020-03-26 15:05:35 +00:00
TreeHugger Robot
6f16992d3c Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev 2020-03-26 14:57:44 +00:00
Automerger Merge Worker
04be843ab3 Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp 2020-03-26 13:39:05 +00:00
Alex Johnston
ff02f246c9 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45 
Change-Id: I7ad8727e62802411caea66fab8e81decd6878abb
 2020-03-26 13:39:00 +00:00
Alex Johnston
cf38af6de6 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 
Change-Id: Ic438fc8b8ba8a62cb718f18a5edb83066f132efe
 2020-03-26 13:38:54 +00:00