PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,371 Commits 1 Branch 0 Tags
b6d18514ae19122880dd6fc8c28ea63b87dcfbdc
Commit Graph

62371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Automerger Merge Worker
cde2d3981b 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 am: ea7b3d94a8 
Change-Id: Ibeba7ab5d24d4c88bee7fc2e5415c0c0f0ae1887
 2020-03-26 15:47:39 +00:00
TreeHugger Robot
d0ff75aefa Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02 
Change-Id: I6c1483bd9f3c28c67f71ccf3365def35b11d10fb
 2020-03-26 15:47:27 +00:00
TreeHugger Robot
b1fffc6071 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: cff829902d 
Change-Id: I195c78382e551f15deb40c036e21aa5f202a9faa
 2020-03-26 15:46:27 +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
cff829902d Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d 
Change-Id: Ib7093bc6fff9123f7a0b8eba8b74e8ae399371e8
 2020-03-26 15:28:46 +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
Alex Johnston
1b20885f5b Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead am: eb0d29514c 
Change-Id: Iffb8b725b14e404c3a62ad58d17af075ac1289d5
 2020-03-26 14:10:48 +00:00
Automerger Merge Worker
90da510597 Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp am: 04be843ab3 
Change-Id: I984611ffa131e55ed89c6ac5d17c203417b4ad79
 2020-03-26 13:52:23 +00:00
Alex Johnston
bd706ef24f Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6 
Change-Id: I76b103fa54c7e357e3fc941b704b0d6ed010f2e7
 2020-03-26 13:52:06 +00:00
Alex Johnston
eb0d29514c Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead 
Change-Id: I2cdc37710191188b232439acfb38bf7a7afb8327
 2020-03-26 13:51:57 +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
1f95535ead Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 
Change-Id: I9345f04b8ca27b370abd74e460e8f63b04b11888
 2020-03-26 13:38:56 +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