Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,876 Commits 1 Branch 0 Tags
09770eb915e13a7f295468c31cda70ca9b2a6000
Commit Graph

15936 Commits

Author SHA1 Message Date
TreeHugger Robot
e9cbde201b Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" 
* changes:
  [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff
  [automerge] Update multiple users strings 2p: 296b904bf1
  Update multiple users strings
 2022-03-24 04:05:07 +00:00
TreeHugger Robot
c0f98c7049 Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" 
* changes:
  [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624 2p: 5178f33861
  [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624
  Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings
 2022-03-23 23:33:50 +00:00
TreeHugger Robot
80bb0d7986 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic42a9fdf552b40d300604ee1a04b4d28f6eac3bc
 2022-03-23 20:14:07 +00:00
TreeHugger Robot
e7f902f21c Merge "Add summary to "Vibration & haptics" settings" into tm-dev 2022-03-23 19:58:55 +00:00
Matt Pietal
607f402bff [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: I06147b00879436ddbc477061c6dfb40c5e8c12d7
 2022-03-23 17:40:52 +00:00
Matt Pietal
296b904bf1 Update multiple users strings 
To match latest guidance

Bug: 219078700
Test: manual
Change-Id: Ieef884e046e1e1798cc98a553bcd902c1374d069
 2022-03-23 13:39:42 -04:00
Shivam Agrawal
8d6b19c0bf [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624 2p: 5178f33861 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: I013479e1be66fb21b3799a1966e7a09c5a7a0990
 2022-03-23 16:34:23 +00:00
Shivam Agrawal
c39ddd2624 Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 
It failed with Resources$NotFoundException and it blocks
WindowManager extensions CTS tests, so ignore it at first.

Bug: b/213322133 b/216630912
Test: atest com.android.settings.deviceinfo.PublicVolumeSettingsTest
Change-Id: I6827344b5316a4e57302bfc2e7ec4cf3674d6990
 2022-03-23 12:31:28 -04:00
Chaohui Wang
1ad2b83207 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: Ic1e2a5c85f2e7ebb2b78ff9dcabc359d4ae032f5
 2022-03-23 13:22:12 +00:00
Chaohui Wang
8ba7ed6451 Merge "Fix SetupChooseLockPasswordTest" into tm-dev 2022-03-23 13:09:19 +00:00
Lais Andrade
68d7b91bb1 Add summary to "Vibration & haptics" settings 
Use VIBRATE_ON main toggle to display on/off state as summary for
"Vibration & haptics" settings provider.

Fix: 220218654
Test: VibrationPreferenceControllerTest
Change-Id: Ifd4b9c7b1cb68ad0ea535091804a1e7f54297c44
 2022-03-23 12:14:52 +00:00
Chaohui Wang
1933ffacab Fix SetupChooseLockPasswordTest 
Test fail is caused by method getVisibleScreenLockTypes() renamed to getVisibleAndEnabledScreenLockTypes() in
https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/14269154

Fix: 201021223
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupChooseLockPasswordTest"
Change-Id: Idcc7a9794217c1ef81ca4a26351e26773b18ccad
 2022-03-23 17:19:21 +08:00
TreeHugger Robot
5068ff38b7 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: If7f7edcd139a5f9a651c9e089380643dcd2b3bdf
 2022-03-23 08:47:35 +00:00
TreeHugger Robot
a12da0a8e8 Merge "Fix adding wifi configuration issue" into tm-dev 2022-03-23 08:27:47 +00:00
TreeHugger Robot
5c1e297131 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I2f3e5559c012457715257e5734121ae936f99782
 2022-03-23 08:11:00 +00:00
TreeHugger Robot
764d7f4b73 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev 2022-03-23 08:00:05 +00:00
Gary Jian
abbccaf748 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I551760d32c0bea35118fae7b579f0283fedaea15
 2022-03-23 07:04:19 +00:00
Gary Jian
e1356cdb64 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I12e5aa6274b2db7f70a231d8b6512f40d32ff8a9
 2022-03-23 06:56:17 +00:00
Gary Jian
24888461da Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
 2022-03-23 06:34:55 +00:00
Gary Jian
78b2b241a9 Merge "Add a developer option to controll mockmodemservice permission" 2022-03-23 05:46:22 +00:00
Weng Su
f5cd7140f4 Fix adding wifi configuration issue 
- The Wi-Fi Enterprise Restrictions add a new
  UserManager.DISALLOW_ADD_WIFI_CONFIG restriction from T.

- When a user requests to add Wi-Fi configuration, Settings will
  reject the request if the user is not allowed.

- The above restriction need to be retrieved in advance so that the
  user's request will not be rejected.

- See the result screenshot in b/224459753#comment8

Bug: 224459753
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivity

Change-Id: I2dfb6b9946dd9dbd4eb8bf0f6549ac5cb4466f17
 2022-03-23 06:18:55 +08:00
Weng Su
98d30c880d Fix ConnectivityManager.requestNetwork crash issue when try again 
- When the user requests "try again", the Network-Request-Dialog will be
  recreated. If the Wi-Fi framework sends the callback result at this
  time, the Network-Request-Dialog may not be ready at the moment,
  causing the NPE to crash.

- Add NPE checks to avoid crash issues.

Bug: 220679437
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkRequestDialogActivityTest

Change-Id: I8e48a29649e72d9f8c67c4ac24f0eb27ba600dae
 2022-03-22 18:14:22 +00:00
Yuri Ufimtsev
b1469cce58 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: Ic2fe73e794f3f41708308762757270024e696a93
 2022-03-22 13:55:33 +00:00
Yuri Ufimtsev
7e7d3f898e Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev 2022-03-22 13:41:09 +00:00
Chaohui Wang
46d1fa4b82 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: If75b43150ced9d15d36e24fd3bb3c0b92338fa48
 2022-03-22 12:25:25 +00:00
Chaohui Wang
9512dfd7a2 Merge "Fix SetupSkipDialogTest" into tm-dev 2022-03-22 12:11:04 +00:00
TreeHugger Robot
77c7fbc845 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: 5376e4bf59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17309763

Change-Id: Iedd37ad8905a2418c455924a54a136956abf40a4
 2022-03-22 11:42:08 +00:00
TreeHugger Robot
5376e4bf59 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev 2022-03-22 11:20:55 +00:00
Yuri Ufimtsev
be98245015 Declare task affinity for entries that could be launched by SafetyCenter 
Test: manual

Bug: 222676668
Change-Id: I44c2f0cee61ffd8f10284cda5a740a9e9d9ea7bb
 2022-03-22 10:36:28 +00:00
Chaohui Wang
8a651a499c Fix SetupSkipDialogTest 
Fix: 201021329
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupSkipDialogTest"
Change-Id: Iba6c8a8345cea0c69aab95630be26bd5b7ce3691
 2022-03-22 18:07:57 +08:00
Minche Li
1fb55c056a Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev am: 41257fe00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286343

Change-Id: Id3aeecb00020ce42c14ce954279a79d270f25cd1
 2022-03-22 09:44:45 +00:00
Minche Li
41257fe00a Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev 2022-03-22 08:54:12 +00:00
Wesley Wang
5367c602d2 Merge "Update battery saver schedule min trigger value" into tm-dev am: 878dae3db0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252813

Change-Id: I159db97f0953c9569592ea123c64e89baac87e1a
 2022-03-22 07:05:37 +00:00
Wesley Wang
878dae3db0 Merge "Update battery saver schedule min trigger value" into tm-dev 2022-03-22 06:51:52 +00:00
Gary Jian
5a535e6674 Add a developer option to controll mockmodemservice permission 
Bug: 220995034
Test: 1.enable/disable from developer option and check the property value
      2.atest MockModemPreferenceControllerTest

Change-Id: Iaa1a29f4214e1208fe4de497ff4b05c47c34b266
 2022-03-22 12:02:52 +08:00
Arc Wang
61a733ad0f Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings 
It failed with Resources$NotFoundException and it blocks
WindowManager extensions CTS tests, so ignore it at first.

Bug: 216630912
Test: atest com.android.settings.deviceinfo.PrivateVolumeForgetTest
Change-Id: Iec270535a73bcca5879d2792c181d853b4af7250
 2022-03-22 02:24:36 +00:00
mincheli
57b35f9f35 Hides the settings entry in Magnification Settings if window magnification feature is not supported 
If the device doesn't support window magnification featue, we
should hide the settings entry in mangification settings

Bug: 213414385
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I73f087da54cd2930c049dabb6b843c3b373e3c20
 2022-03-21 22:48:34 +08:00
Wesley Wang
b26d99ac77 Update battery saver schedule min trigger value 
- Udpate the min value to 10%, also change related preference summary
   and seekbar value
 - Make battery saver main page's switch support first time trigger
   warning

Bug: 207470943
Test: make RunSettingsRoboTests
Change-Id: I120b9a6784ed90eacccb09bb11f079f12679e95c
 2022-03-21 16:13:34 +08:00
Treehugger Robot
3378f6e4da Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I4d509aab5b501b432bdd6789827945508c7468f0
 2022-03-21 06:25:46 +00:00
Treehugger Robot
3c209b06c0 Merge "Add LE audio hardware offload development option" 2022-03-21 05:24:10 +00:00
Jenhou (Alan) Huang
e8ca43b239 Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev 2022-03-21 01:59:31 +00:00
Bonian Chen
8837fa3d3b Merge "[Settings] Code refactor - NetworkModePreference" 2022-03-21 00:16:02 +00:00
Alan Huang
616b0925ac DO NOT MERGE Add setting page for the Spatial audio 
The Spatial audio settings page control the state for the phone speaker
and the wired headphones

Test: make RunSettingsRoboTests

Bug: 220811398
Change-Id: I49e3fab48186d09357a8481652bdccb4aa5d044a
 2022-03-20 15:55:53 +00:00
Bonian Chen
93ca7288cf [Settings] Code refactor - NetworkModePreference 
Code refactor for improving readibility.

Bug: 223461708
Test: unit test EnabledNetworkModePreferenceControllerTest
Change-Id: I3b3157cbc76f104d63062fda495a7391ecc18ada
 2022-03-19 10:46:06 +08:00
Giulio Fiscella
d5d6846846 Merge "Use new severity levels and builders" into tm-dev 2022-03-18 22:00:01 +00:00
Giulio Fiscella
95e5170354 Merge changes from topic "cherrypick-scIntDefs-s2hgwk1y41" 
* changes:
  [automerge] Use new severity levels and builders 2p: 3612e9e440
  Use new severity levels and builders
 2022-03-18 12:32:10 +00:00
Kate Montgomery
2d570febb1 Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772

Change-Id: Ib17152dbc29a9cc0588607966da310e53cdba4bb
 2022-03-17 19:46:34 +00:00
Kate Montgomery
798a0fab9c Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev 2022-03-17 19:14:04 +00:00
Giulio Fiscella
9112567332 Use new severity levels and builders 
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
Merged-In: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
 2022-03-17 11:44:39 +00:00
Giulio Fiscella
8861c5d16c [automerge] Use new severity levels and builders 2p: 3612e9e440 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238283

Bug: 218817241
Bug: 220367542
Change-Id: I75a2c08dc05fcf6788d034c3981164cfe23a20d8
 2022-03-17 11:34:56 +00:00