Commit Graph

81338 Commits

Author SHA1 Message Date
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
ykhung
1b8a100c7a Fix testing fail for BatteryEntryTest from patch ag/14008232
Bug: 184138623
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic770b09cc303a9f213e31174f279940c2aa1f87d
2021-04-01 13:40:11 +08:00
Jeremy Goldman
761b0f0b77 Revert "Unit tests for the VpnInfoPreference."
This reverts commit 1e461619ab.

Bug: 183926662
Reason for revert: Quick fix to resolve broken test in production

Change-Id: Iadd655ed522c3c3c39109655183859e8b4875acd
2021-04-01 04:53:01 +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
Hai Shalom
f909a3d29e Settings: Rename OCSP Do not validate option
Rename OCSP "Do not validate" option to "Do not verify".

Bug: 176863452
Test: compiles, verify new string
Change-Id: I806c29a711b674a9f5636ee84e55367fb6391ac8
2021-03-31 21:11:47 -07:00
Wesley.CW Wang
79ce6650bc Update battery settings relative strings (2/3) am: e9cfef7ace
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048547

Change-Id: Id40d818662fdf4fe878819151e751fb55cf22f65
2021-04-01 03:56:41 +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
jasonwshsu
541e3334ae Update accessibility settings layout
Accessibility settings category restructure
1. Bring back reduce bright color and dark ui mode to the top level

Bug: 174829936
Test: manual test
Change-Id: I733a9e115645bbe663bedd98fe0193cef840a0ee
2021-04-01 10:35:47 +08:00
Bonian Chen
87e0ee06a6 [automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 am: 5735be835c -s ours am: 02fc12a796
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I47d2fa72d72aa0a52194354eb6bc0af23a96f7d7
2021-04-01 02:35:07 +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
Wesley.CW Wang
e9cfef7ace Update battery settings relative strings (2/3)
Bug: 183689347
Test: make
Change-Id: I11524a8bf6d929faa4e5f51581600b12916e3c46
2021-04-01 02:10:54 +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
Bonian Chen
02fc12a796 [automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 am: 5735be835c -s ours
am skip reason: skipped by user bonianchen

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I2204d4f9d87decdb34160a75b895f143fffc3882
2021-04-01 01:56:32 +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
TreeHugger Robot
73961cf510 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46b5695031 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054530

Change-Id: I6290aaafcbd76c6cb3008b9b2cf27beacb6831ec
2021-03-31 22:41:51 +00:00
TreeHugger Robot
c988d01854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bb799e3144 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054531

Change-Id: If069d4ee4022266cc20152875c64a4c67a805003
2021-03-31 22:40:25 +00:00
TreeHugger Robot
46b5695031 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-31 22:35:24 +00:00
TreeHugger Robot
bb799e3144 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-31 22:25:34 +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
Bill Yi
5d5f583dc8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I178674550fc86cf77ac47ee88e36a0903bb2caff
2021-03-31 19:52:15 +00:00
Bill Yi
29f8151d1e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id2e9d44d1f15a657d7e1651aca6e04d9d3586682
2021-03-31 19:19:40 +00: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
Jernej Virag
3340db9ef0 Fix error in PowerMenuSettingsControllerTest am: 512419a454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051305

Change-Id: If708b4979129e426158151bb665354724f54586c
2021-03-31 15:43:54 +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
a472f53325 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I0330a149d0b686e8acee05a5028f67e1cb7ad3a6
2021-03-31 15:03:38 +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
Jernej Virag
512419a454 Fix error in PowerMenuSettingsControllerTest
"allUnavailable" should actually mean long press on power menu unavailable as well.

Bug: 184138823
Test: make RunSettingsRoboTests
Change-Id: Idee6b0a665941d5840166331f76e571e2539bd2e
2021-03-31 13:53:27 +00:00
Arc Wang
a5acc0ca12 Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: de4494dea4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029459

Change-Id: I7f027eaf9a076931222a81eee40d91e42b5cacc9
2021-03-31 12:53:56 +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
de4494dea4 Merge "Fix the issue of the repo upload hooking checker" into sc-dev 2021-03-31 12:36:59 +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