Commit Graph

60422 Commits

Author SHA1 Message Date
Alic Tsai
358d369f4b Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0 am: e4f765ac3f
Change-Id: I52a57a0382d848c4c9b454e5d05392b6d2fb1013
2020-03-27 13:07:00 +00:00
Alic Tsai
e4f765ac3f Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0
Change-Id: I4523911f8607d76c03e8141d3b68232fa4ec489f
2020-03-27 12:50:21 +00:00
Alic Tsai
4d7db64de0 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
Change-Id: Ieeb02f1baee4f3a95d889b21ce873d503d04e3ec
2020-03-27 12:33:50 +00:00
Alic Tsai
df8b9acc69 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev 2020-03-27 12:20:35 +00:00
James Lin
765c0494dc Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 373752d45c
Change-Id: I90c9a4245d01e0e3ee7319bc2744ba4d1a9faf14
2020-03-27 10:41:48 +00:00
James Lin
373752d45c Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981
Change-Id: I313898b71bb988c071415fbfe48f7f3442a7690a
2020-03-27 10:29:34 +00:00
James Lin
0fa4005981 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20
Change-Id: Idc7e4d7615f1f23a4205b81a4ef3cd38d6412556
2020-03-27 10:13:53 +00:00
James Lin
a7a3304a20 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev 2020-03-27 09:56:32 +00:00
TreeHugger Robot
35a9e8cad5 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 am: 30cb1ddee7
Change-Id: Ie909aded611808c9ca45da27caa4955a327ef7f2
2020-03-27 08:47:47 +00:00
TreeHugger Robot
30cb1ddee7 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54
Change-Id: I7897beb3af66d1f9b09ded36108dd3c56013eef7
2020-03-27 08:35:30 +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
a7e049581e Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: dfc1d3a654
Change-Id: I8ade27a865c83109eb4150e99fff3adc4a5414d9
2020-03-27 06:25:49 +00:00
Edgar Wang
dfc1d3a654 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e
Change-Id: I632a61fc3a576f6dc91f3f08ad96d429cd62ff19
2020-03-27 06:10:46 +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
alictsai
6b76eb0ab6 Device details LCR should be show up " ! " with low battery.
screenshot:
https://screenshot.googleplex.com/f72YS3THutW.png
https://screenshot.googleplex.com/v6uw7XsOs9x.png

Bug: 151187813
Test: make -j42 RunSettingsRoboTests
Change-Id: Iabb4ac54e6f827f54cd7c5512995f185875e4a06
2020-03-27 13:14:01 +08:00
Stanley Wang
e9027091d3 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c am: d17f33c675
Change-Id: Iaf17f0a7c64615386dce77eaca2fa78fedc1b0e3
2020-03-27 03:59:52 +00:00
TreeHugger Robot
c42efe72b9 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3 am: 9a7d5e058a
Change-Id: I7fbf2215267e54742bceba5f160c9f5b2dea609e
2020-03-27 03:59:46 +00:00
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
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
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
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
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
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
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
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
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
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
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
300b3742fd Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
Change-Id: If875b3ad36863daff5e408a142caade2b44a3f18
2020-03-26 21:06:31 +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
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
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
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
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
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
bbd65ff983 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
Change-Id: I259abdec68097485aa875e802a3e39b6098fba9c
2020-03-26 13:19:57 +00:00
Alex Johnston
7bc50ac2ef Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev 2020-03-26 12:58:49 +00:00