Commit Graph

37240 Commits

Author SHA1 Message Date
Pavel Grafov
8bdddf8ba4 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931 am: 69022ccc3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: I02869fbbff2a04b2b67769c731b75d4e9f85d968
2021-04-01 15:02:27 +00:00
Pavel Grafov
69022ccc3a Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: Iaa80f44026f969706701bfc6a4aa4317b1a8acf2
2021-04-01 14:24:46 +00:00
tim peng
8e6583cf69 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev am: 6f96226f45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045485

Change-Id: Ib71bad87161501a98eec50ca3cbe12544f0c68c5
2021-04-01 14:00:28 +00:00
Pavel Grafov
efab095931 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp 2021-04-01 13:49:32 +00:00
Tim Peng
93ee8efe94 BTHS will have no sound after disable HD audio
-setCodecConfigPreference() should not be called when disableOptionalCodecs() is called.
-disableOptionalCodecs() would set SBC codec automatically

Bug: 183456866
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothCodecDialogPreferenceControllerTest
Change-Id: Ib18f4a683dcba7ba92df827c30da0088c90b4d72
2021-04-01 21:38:00 +08:00
tim peng
6f96226f45 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev 2021-04-01 13:25:31 +00:00
Pavel Grafov
735a216da3 Prevent disconnecting admin-configured VPN
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
2021-04-01 12:39:32 +01:00
jasonwshsu
6e33293fa3 Remove unused code
* isColorTransformAccelerated() already moved to ColorDisplayManager
* TurnScreenDarker fragment already moved to top level accessibility settings or TextAndDisplay fragment

Bug: 174829936
Test: manual test
Change-Id: I34ec6947129a5042d573e94eabe3c24c2fe761b5
2021-04-01 09:41:11 +00:00
Tsung-Mao Fang
10246383a0 Merge "Only display single line for title" into sc-dev am: 6d0ed92049
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060693

Change-Id: I4f8023f23e0561bee0afcc8688db173caa3c70fa
2021-04-01 07:59:35 +00:00
Tsung-Mao Fang
6d0ed92049 Merge "Only display single line for title" into sc-dev 2021-04-01 07:41:55 +00:00
Tim Peng
7246a4f842 [Rohan]The battery level show up "-1%", not sync with Rohan.
-Hide battery information when it is unknown

Bug: 184017556
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I5f94ccae364f1420e04af21ba425c29ac6a11dd2
2021-04-01 15:40:54 +08:00
Wesley.CW Wang
ce453159f7 Update low battery tips string am: 6d836d2d51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048550

Change-Id: I20ef817e4cd7bea00cc4ea6b74a35c7ea82022c6
2021-04-01 06:52:53 +00:00
Wesley.CW Wang
6d836d2d51 Update low battery tips string
- Screenshot: https://screenshot.googleplex.com/33zJkqsTex8r49W.png

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I864c555c3e500bf4ae5364db8dd6c86be564b883
2021-04-01 06:30:08 +00:00
Hugh Chen
ebe6e7e5ea Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev am: cf2dc5107b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056750

Change-Id: Ic276e1f9f9db9eff9258f7501d03a66e41963745
2021-04-01 06:05:47 +00:00
Tsung-Mao Fang
f7ae52bed6 Only display single line for title
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
2021-04-01 05:48:04 +00:00
Tsung-Mao Fang
4f6caf2941 Only display single line for title
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
2021-04-01 13:45:24 +08:00
Hugh Chen
cf2dc5107b Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev 2021-04-01 05:40:21 +00:00
Yanting Yang
934fbb91a8 Merge "Add positive button into regulatory info dialog" into sc-dev am: 123422c99c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048549

Change-Id: I707dfce8e1dd57e9d89fa6096226732cc7f50870
2021-04-01 04:16:22 +00:00
Tsung-Mao Fang
ba9215cbda Revert "Only display single line for title"
This reverts commit 121041cf58.

Reason for revert: Some use cases don't need single line design. see b/184108687

Fix: 184108687
Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7
2021-04-01 04:14:03 +00:00
Yanting Yang
123422c99c Merge "Add positive button into regulatory info dialog" into sc-dev 2021-04-01 03:54:27 +00:00
Bill Lin
e43497ff54 Merge "2/ Make One handed mode support multiple user switch" into sc-dev am: e3e3fc915a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849836

Change-Id: I446caec4128640628d205babf4b5306c99a2eb90
2021-04-01 02:37:25 +00:00
Hugh Chen
802cb176d0 Revert "Fix bluetooth settings will broadcast to anywhere when some cases"
This reverts commit 9d00364da4.

Reason for revert: This fix have a regression, for not blocking b/183344112 revert it.

Change-Id: Ic4366b51e07b43c8d64d2e145563d8a30cb0fc60
2021-04-01 02:24:51 +00:00
Bill Lin
e3e3fc915a Merge "2/ Make One handed mode support multiple user switch" into sc-dev 2021-04-01 02:02:39 +00:00
Adam Bookatz
60a296d290 Failed guest creation doesn't crash Settings
In the new multiuser settings, there's no logic to handle
what happens when a guest user creation fails, and so Settings
crashed with a NullPointerException.
In the fix, we catch this case to avoid crashing, and display
a toast to the user so that they understand the operation was
not successful.

Bug: 175042193
Test: manually failed to create user and observe toast and no crash
Change-Id: I7dfcaa1eb6d4b792946e18d1632fd2c75e93c168
2021-03-31 18:41:57 -07:00
Ahaan Ugale
cccaf43f2a Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev am: 3afa988e1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13988607

Change-Id: Ifc1f436f389586d5c155d7e109521fee9ab902e9
2021-04-01 00:26:27 +00:00
Ahaan Ugale
3afa988e1e Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev 2021-03-31 23:42:10 +00:00
Yu-Han Yang
34980d9314 Merge "Update Location Settings footer when MLS changes" into sc-dev am: 844347bd27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14036910

Change-Id: Ic9628e6bf86146912db634a00edb749cc63058be
2021-03-31 22:12:37 +00:00
Yu-Han Yang
844347bd27 Merge "Update Location Settings footer when MLS changes" into sc-dev 2021-03-31 21:38:29 +00:00
Yu-Han Yang
4b2e6f76ff Update Location Settings footer when MLS changes
Also changed strings:
- from "Manage location permissions" to "App location permissions"
- from "Location Services" to "manage location services"

Bug: 180533061
Test: on device
Change-Id: I135430674b9363ea7caaa44f6e9baed96b6ec3cf
2021-03-31 13:15:36 -07:00
Yi-an Chen
faf203edea Add top level privacy hub preference
Bug: 176902658

Test: Manually tested on Sargo DVT
Change-Id: I15d09f0288acadd7599dbe7a2a01223949b40e8f
2021-03-31 18:10:41 +00:00
Wesley.CW Wang
f97a5e8fc1 Update battery progress bar am: fdfda5e589
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045496

Change-Id: I008cdd00eb1c607c61cacd7aab037426dd83de1d
2021-03-31 17:31:30 +00:00
Wesley.CW Wang
fdfda5e589 Update battery progress bar
- Setup state text to bottom text view
 - Remove battery state icon
 Screenshot: https://screenshot.googleplex.com/At9tAVDgnoQBtNS.png

Bug: 177407113
Test: make RunSettingsRoboTests
Change-Id: I86cfe83982da70b8fc49386f388c1a068295e205
2021-03-31 17:04:24 +00:00
Beth Thibodeau
643eb42323 Update style of main media setting toggle
Bug: 183347608
Test: visual
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I0a882b769af93914ff01e428f9c07d3ab22cc36a
2021-03-31 12:12:27 -04:00
Bonian Chen
5735be835c Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I6100fa84ad5be8d33bd20d9836ecd432a217fe7a
2021-03-31 15:44:41 +00:00
Pavel Grafov
16d588c11a Prevent disconnecting admin-configured VPN
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.

Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.vpn2
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
2021-03-31 15:20:11 +00:00
Bonian Chen
194af56330 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU"
* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"
2021-03-31 14:30:40 +00:00
Arc Wang
9d5b4688e2 Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev am: aed1bba60a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029456

Change-Id: I3a382089a60bc5c036d7e5d2fee85ddff03de68f
2021-03-31 12:53:38 +00:00
Arc Wang
aed1bba60a Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev 2021-03-31 12:36:46 +00:00
Alex Johnston
90119bca81 Merge "Remove hardcoded URL string" into sc-dev am: a05759cb7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14033950

Change-Id: I033baaa50a01bdc0090beade4a51e285f9451477
2021-03-31 11:04:01 +00:00
Alex Johnston
a05759cb7d Merge "Remove hardcoded URL string" into sc-dev 2021-03-31 10:35:51 +00:00
Yanting Yang
acbd60285f Add positive button into regulatory info dialog
Based on UX decision to add the positive button into regulatory info
dialog to exit.

Bug: 180558322
Test: visual
Change-Id: I0939ec11d140b5df6d4104042cc376b5c07f12e4
2021-03-31 18:00:29 +08:00
Bill Lin
49ba85dc8a 2/ Make One handed mode support multiple user switch
Previously OHM did not support for multile user switch.
We get current user id in settings and get/put settings value
with currentUserId.

Test: manual switch user and check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests -j40

Bug: 182278800
Change-Id: I12dcc7b634ae19375358733357dc95197e81067c
2021-03-31 17:48:23 +08:00
Bonian Chen
2b195b4335 Revert "[Settings] Support getSystemService(Class<T>)"
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)"
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
2021-03-31 09:37:03 +00:00
Alex Johnston
56519258ef Remove hardcoded URL string
* Details on URLs in the credential management
  app preference should be translatable.
* Remove hardcoded text and introduce strings.

Manual testing
* Download TestDPC and select 'Request to
  manage credentials'.
* Select allow.
* Go to Settings Credential management app
  preference and verify URL strings are displayed
  correctly.

Bug: 170627997
Test: manual testing
Change-Id: Iadff0c136064dabc3f77e30b46356126d657397f
2021-03-31 10:17:36 +01:00
Yanting Yang
9916f07f3e Merge "Make work profile sounds section as its own entry" into sc-dev am: 6ef0b34a32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887089

Change-Id: I819769ce85ccdb316600df7da4c55552a2be6982
2021-03-31 08:37:28 +00:00
Yanting Yang
6ef0b34a32 Merge "Make work profile sounds section as its own entry" into sc-dev 2021-03-31 08:08:41 +00:00
Mill Chen
a1490d26c4 Merge "Add an error dialog in FingerprintEnrollFindSensor" into sc-dev am: 3525843554
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029861

Change-Id: Ib399d432aa4cf8c18aad79a0779e5026c262865f
2021-03-31 03:39:50 +00:00
Ahaan Ugale
318f7cc512 Fix passwords settings crash due to null lifecycle owner.
A change related to lifecycles was reverted some time ago
(I7e6d2e9e6fd363a3afdd3dbab24e7c3b36e9ed29), which caused this to break.

The crash is only seen if an autofill service sets the new Passwords
Activity attr; currently no services do.

Fix: 184077486
Test: manual - check settings page and see no crash
Test: manual - same with work profile added
Test: make RunSettingsRoboTests
Change-Id: Ie439f37c9e884f9de2b112b348e1bef03adcd077
2021-03-31 03:31:33 +00:00
Mill Chen
3525843554 Merge "Add an error dialog in FingerprintEnrollFindSensor" into sc-dev 2021-03-31 03:11:10 +00:00