PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,167 Commits 1 Branch 0 Tags
ef0b84e8cbef4b718991474d8da2189c31b01206
Commit Graph

9692 Commits

Author SHA1 Message Date
TreeHugger Robot
ebe03ee645 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 23188466eb am: ea2948eaaa 
Change-Id: I844e7151e9f23a0d1ce6cb6b04432d80bb3a1cbe
 2020-03-26 22:10:28 +00:00
TreeHugger Robot
7440bf7034 Merge "DND Bypassing Apps redesign" into rvc-dev 2020-03-26 20:54:33 +00: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
70d4ea36b6 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02 am: d0ff75aefa 
Change-Id: Iff645fdb71c160abb7d38f4fcc56076fc10addc5
 2020-03-26 16:02:43 +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
40417d3efe Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6 am: bd706ef24f 
Change-Id: If66284619518916e18d867a10cbc42a635d69317
 2020-03-26 14:10:31 +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
TreeHugger Robot
4b341e15ce Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: c228661d69 am: 4fdff5e5a4 
Change-Id: I35263c6eb6521805c542c83664596cc3502fdbea
 2020-03-26 12:35:18 +00:00
govenliu
0fc956bc57 [Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint. 
Because WifiTracker2 refactoring in framework side is done, Settings App need to refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.

Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ica2fb7e7fcac112140e5d64f3e4193222c974352
 2020-03-26 19:48:51 +08:00
TreeHugger Robot
cb90ffafbb Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev 2020-03-26 11:47:07 +00:00
Automerger Merge Worker
987441d843 Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp am: 6217097f81 am: 3773751627 
Change-Id: If7607352a3d7441d357e8fc6b457f1546c16bd04
 2020-03-26 10:41:03 +00:00
Alex Johnston
74260a733f Retain FRP data when FR is invoked in Settings 
* If the device is an organization-owned managed
  profile device and a FRP policy is set, the
  factory reset protection data is no longer
  erased from factory reset in Settings.

Bug: 148847767
Test: manual testing
Change-Id: Iebaf2446f23626b24db37f5173dc77f9dee25ba9
 2020-03-26 10:29:52 +00:00
Jason Chiu
1a9e99b2b1 Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev 2020-03-26 09:47:18 +00:00
TreeHugger Robot
778f3de13f Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: 0dcef519de am: 525a986b38 am: b7ce9d8e3b 
Change-Id: Ib260e880248afc3086468b752eddcf9fee951e3a
 2020-03-26 06:08:24 +00:00
TreeHugger Robot
ef84083712 Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev 2020-03-26 05:03:03 +00:00
Arc Wang
76740afba2 Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f am: 45aa81bc52 am: 1beb4afce7 am: 2dba198a1b 
Change-Id: I65cd00ac3768263d283b7691f1e392eaebeff66b
 2020-03-26 04:03:32 +00:00
Jason Chiu
26343b82ee Add metric logs for special cases in Display and Battery page 
Bug: 137559984
Test: robotest
Change-Id: I60f6237ac2c533306879f46ee4c25d54002cf0e9
 2020-03-26 11:31:39 +08:00
Arc Wang
249f629b22 [Wi-Fi] Remove @Ignore unit tests 
Remove @Ignore in these objects:

  ConfigureWifiSettingsTest
  TetherServiceTest.java
  WifiTetherSecurityPreferenceControllerTest.java
  WifiSettings2Test

Bug: 151696220
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I19bdc251d76161218454c1b5f58421efab33cec0
 2020-03-26 11:18:27 +08:00
Arc Wang
b3c16d5d4f Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev 2020-03-26 03:07:33 +00:00
Arc Wang
aa05461b9c [Wi-Fi] Fix unit test ssidPref_isSubscription_show 
Only setSummary for mSsidPref when the SSID is not null

Bug: 152375927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia39f01e6bdb7b1b531a6b07610e061a98140dda4
 2020-03-25 23:48:07 +08:00
TreeHugger Robot
577f1905f3 Merge "Ignore the failed test cases" into rvc-dev am: 49bc53ec0a am: bdf71b85ff am: 68d21b873c am: ec6494fe7d 
Change-Id: I5c22a4edbc6c66a96b7150e18e66f76310c12549
 2020-03-25 13:52:18 +00:00
TreeHugger Robot
49bc53ec0a Merge "Ignore the failed test cases" into rvc-dev 2020-03-25 12:40:37 +00:00
TreeHugger Robot
ff9e7720ea Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev am: a802eba9b8 am: 202e028212 am: 42b9886a66 am: b794d5969c 
Change-Id: If04a12f9f5aa1f3bf469dfddc9abaacd6f82160a
 2020-03-25 12:02:18 +00:00
TreeHugger Robot
a802eba9b8 Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev 2020-03-25 10:56:22 +00:00
Mill Chen
e18e25d697 Ignore the failed test cases 
Bug: 152372274
Test: robotests
Change-Id: Ideb81ac4156c35991bd7d9af4f5cba0ea803d1cc
 2020-03-25 18:47:52 +08:00
Arc Wang
b011c5bf82 [Wi-Fi] Fix check mark button when edit the password of a secured network. 
Should handle WifiConfigUiBase#dispatchSubmit() for check mark button events.

Bug: 152144169
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureAccessPointFragmentTest
Change-Id: I35cbc1cdd6fbef3fd51aaa8dec94722e4155b7f4
 2020-03-25 17:14:28 +08:00
Zhen Zhang
55a96b6fb9 Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8 am: a12da1ba40 am: fb5a490371 am: a824add6af 
Change-Id: Iea936fd0bdaac9f4bd83a754c3e57e1af9fd5ca1
 2020-03-25 08:37:57 +00:00
Zhen Zhang
c37fcd0cb8 Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev 
* changes:
  Fix crash in AllInOneTetherSettings when user is not admin
  Refactor new tether settings to remove SharedPreferences
 2020-03-25 07:25:07 +00:00
TreeHugger Robot
f4e60430f9 Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: 31bd47a36c am: 461dfb3889 am: 8cc6f609ac 
Change-Id: I39da8324580fbffa2625c01e679fc959bf471441
 2020-03-25 06:42:51 +00:00
TreeHugger Robot
6045790df8 Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev 2020-03-25 05:44:07 +00:00
Bonian Chen
e1c699c7af Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: ff7dc60895 am: 8f9c9e6402 
Change-Id: I29886624ce72c8cb3ca6c297ccb7ff1d63e435c2
 2020-03-25 05:15:23 +00:00
SongFerng Wang
00f2672399 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: 3d28629f5e am: 869883bcd8 
Change-Id: I774908569013ae9c0f5d4a620dbe09258b9fa05e
 2020-03-25 05:15:17 +00:00
SongFerngWang
199ee2cbb0 Remove MobileNetworkSettingsTest#onAttach 
The MobilieNetworkActivity has MobileNetworkSettings fragment. The
MobileNetworkActivityTest do testcases for activity stability.
The activity's launch test successful is equals the fragment doesn't
crash, so the activity's testcases cover
MobileNetworkSettingsTest#onAttach.

Bug: 147464840
Test: build pass
Change-Id: Idbabb846c40fd117f22a39b86fd6628b7d8c5b1b
 2020-03-25 04:44:14 +00:00
Bonian Chen
f9bb3b4d05 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev 2020-03-25 04:35:04 +00:00
SongFerng Wang
d33b66304c Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev 2020-03-25 04:16:18 +00:00
Bonian Chen
806c9d5214 [Settings] Code refactor on MobileNetworkActivity 
Apply the behavior of ProxySubscriptionManager into
MobileNetworkActivity.

Bug: 149190278
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I2d4b12dead7a9ea68cc8e335cd37f22226fe295f
 2020-03-25 10:19:40 +08:00
TreeHugger Robot
715687986f Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d am: adce5a2ec1 am: e7a6a2c302 
Change-Id: Ic1b13d094291cf06644533f59b5195183904b5a4
 2020-03-25 00:37:49 +00:00
TreeHugger Robot
d227755be8 Merge "[Settings] Avoid from Settings crash" into rvc-dev 2020-03-24 23:32:34 +00:00
Julia Reynolds
aaa0cc5238 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4 
Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
 2020-03-24 22:00:27 +00:00
Bonian Chen
dcf701efc3 [Settings] Avoid from Settings crash 
Avoid from crash when null pointer.

Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
 2020-03-25 05:48:37 +08:00
Julia Reynolds
2f0bd6552c Update all conversations screen 
Update text, and filter the lower section to match the new
header

Test: atest
Fixes: 151765526
Change-Id: I5bc052813745908df8602bf397434a76b294ba6c
 2020-03-24 19:37:13 +00:00
TreeHugger Robot
d18f4d248a Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: 8247c93340 am: a76db9ae4c 
Change-Id: I57140ea1858a0b35d7c1f04031947eb99bbdc8a0
 2020-03-24 13:23:22 +00:00
TreeHugger Robot
87c0179c01 Merge "Re-enable ignored tests" into rvc-dev 2020-03-24 12:22:11 +00:00
SongFerngWang
a043c5a7ad Fix the NetworkScanHelperTest testcase. 
To fix the NetworkScanHelperTest testcase, becasue mainline cause
the testcase fail.

Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkScanHelperTest
Change-Id: I2992606dd082d2b87e047beacd9cf1c26790f450
 2020-03-24 17:16:51 +08:00
Arc Wang
766e874428 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d am: 787f8a7635 
Change-Id: I394d039cd49428709ce3405d4461bc4c71c7b3b5
 2020-03-24 08:28:45 +00:00
Bonian Chen
77f2788f82 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388 am: 2a25cd5c22 
Change-Id: I3bd85778b588901160779683cb19b5c34c970d21
 2020-03-24 08:12:52 +00:00
Arc Wang
e4b0989766 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev 
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
 2020-03-24 07:25:17 +00:00
Bonian Chen
9a0f633600 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev 2020-03-24 07:03:52 +00:00
TreeHugger Robot
55fa8229a7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf am: 95d85c0e34 
Change-Id: I7335593a093a8e25c0296434e710f7ccd667d140
 2020-03-24 06:52:32 +00:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00