Commit Graph

11498 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Yanting Yang
c54002e192 Add custom site map pairs into SettingsSearchIndexablesProvider
Settings Search need Settings to provide custom site map pairs to build
up full breadcrumb for the search results from ScreenLockSettings,
WallpaperSuggestionActivity and WifiSettings2.

Bug: 147851992
Bug: 151206664
Test: manual test with Settings Search, robotests
Change-Id: Ide6e69b3336af255a388737d46147f2fc2ef9790
2020-03-26 23:04:33 +08: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
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
Alex Johnston
47415a0a45 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
Change-Id: Ib57653e7b2937b6375b2aa287622a900083e723c
2020-03-26 13:19:43 +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
TreeHugger Robot
c228661d69 Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
Change-Id: Ieb74e58728260f1b4e0a0d064e4d2e6062cd6c52
2020-03-26 12:13:17 +00:00
TreeHugger Robot
6b754f1582 Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
Change-Id: Iab2416e3b76b379674fc9e834a192ecf42521f0d
2020-03-26 12:01:04 +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
436fd363a2 Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
Change-Id: Id7aeee1a04db2574632d676bcbba972734ca4cb2
2020-03-26 09:59:00 +00:00
Jason Chiu
5299084eb6 Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
Change-Id: I4b61b4e0ff2f1bbc4bc99597e099cf254f16cb88
2020-03-26 09:53:51 +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
Jason Chang
51a1c46c1c New Settings preference for One Handed mode
Add toggles in Settings location:
Settings > System > Gesture > One-Handed

Bug: 151130376

Test: manual check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures.OneHandedSettingsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedAppTapsExitPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedTimeoutPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures.OneHandedSettingsUtilsTest"

Change-Id: Iafbd3ad051ff0f9c2f4a1b6fcacdccc137b65d0c
2020-03-26 06:49:15 +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
525a986b38 Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: 0dcef519de
Change-Id: Icaf77247994234f5f70e11aca05161734074140a
2020-03-26 05:32:12 +00:00
TreeHugger Robot
fee338d8a1 Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
Change-Id: I02996d3ae6179cc37409d79134139fbed4798ccf
2020-03-26 05:21:10 +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
Arc Wang
1beb4afce7 Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f am: 45aa81bc52
Change-Id: I97225fc67bccc252a2adb078bdce9a2eed1bd0f1
2020-03-26 03:35:50 +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
9e06b953fb Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
Change-Id: I1473a6583f392f6bfcb9da85a3335e0be6cb3406
2020-03-26 03:19:48 +00: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
hughchen
bc5f2fad33 Update customize button title when state changed
- This CL update customize button title when
  onCustomizedButtonStateChanged() is called.
- Add test case

Bug: 152002708
Test: make -j42 RunSettingsRoboTests
Change-Id: I85c9cf90305757e279c058db2875e303b4add437
2020-03-26 10:40:16 +08:00
Brad Ebinger
cacc9dd04b Fixes ContactDiscoveryDialogFragmentTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Fixes: 151172952
Merged-In: I06df2928116b33fec39aade733401d60e6cde1c1
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
2020-03-25 16:23:45 +00:00
Brad Ebinger
f469cac10a Add new DialogFragment and Controller for capability discovery opt-in
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-25 16:19:54 +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
68d21b873c Merge "Ignore the failed test cases" into rvc-dev am: 49bc53ec0a am: bdf71b85ff
Change-Id: I8f63fa10dd66d6b3e6052b09a226a933680b5fa7
2020-03-25 13:11:24 +00:00
TreeHugger Robot
de8ce3ef46 Merge "Ignore the failed test cases" into rvc-dev am: 49bc53ec0a
Change-Id: I8ccad9a2a3db6cc118f6fc41306e404674ee3b91
2020-03-25 12:57: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
42b9886a66 Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev am: a802eba9b8 am: 202e028212
Change-Id: I1bbe29bba534aacf4809620464928bee8bcd98ea
2020-03-25 11:27:05 +00:00
TreeHugger Robot
a9de0d0fac Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev am: a802eba9b8
Change-Id: Ie9308e892fa163091fe3dca73fc0bde18f43a02c
2020-03-25 11:08:23 +00:00