Commit Graph

1400 Commits

Author SHA1 Message Date
Yuri Ufimtsev
d80171d2b4 Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc"
* changes:
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089 2p: 8e7599c129
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
  Postpone getting Metrics Category until it is needed
2022-03-24 07:56:27 +00: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
Yuri Ufimtsev
1d52aa0072 [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089 2p: 8e7599c129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Bug: 226105654
Change-Id: I1122bdd840f7874d28ec812e7e85189ece104d79
2022-03-23 15:47:10 +00:00
Yuri Ufimtsev
8e7599c129 [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Bug: 226105654
Change-Id: If1206914f684741e59e331f6d26a8fc5d7bfc528
2022-03-23 15:47:02 +00:00
Yuri Ufimtsev
af22553089 Postpone getting Metrics Category until it is needed
Test: manual

Bug: 226105654
Change-Id: I9473ddfd72e38bff4f93b43d539c467b2e13e258
2022-03-23 15:41:54 +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
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
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
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
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
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
Giulio Fiscella
3612e9e440 Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
2022-03-17 11:34:42 +00:00
Yuri Ufimtsev
3ed877ffe9 Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev am: 829ee90dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197110

Change-Id: If6a2bbb6a6dcf5d51c81a3dc341ad69234b3c46b
2022-03-16 09:42:50 +00:00
Yuri Ufimtsev
829ee90dd3 Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev 2022-03-16 09:33:26 +00:00
PETER LIANG
b556a99bd0 Merge "Fix that the toggle of High contrast text doesn't change to turn off after tapping the Reset button." into tm-dev am: 9f9c2593ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17183508

Change-Id: I8f7757de919f2a7f4c0333f447af66767cbba53f
2022-03-16 03:01:13 +00:00
PETER LIANG
9f9c2593ad Merge "Fix that the toggle of High contrast text doesn't change to turn off after tapping the Reset button." into tm-dev 2022-03-16 02:35:33 +00:00
Yuri Ufimtsev
4e255cb407 Set the Refresh Broadcast ID for Safety Event if available
Test: atest SettingsUnitTests

Bug: 222679576
Change-Id: I52ba3aff3045a8211fc936240f1310da6fad9fb0
2022-03-15 15:23:07 +00:00
Peter_Liang
9a845de914 Fix that the toggle of High contrast text doesn't change to turn off after tapping the Reset button.
Solution:
Triggered the updateState() after setChecked() to ensure the UI with the correct state.

Fix: 220081053
Test: atest HighTextContrastPreferenceControllerTest
Change-Id: I33c61d4e5602dfd67ec93a0826613304a1af7c2d
2022-03-14 18:58:30 +08:00
SongFerng Wang
e742684bba Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev am: faa0eddcc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17159743

Change-Id: Iff7f806c02ad6a4413f9a98eb7db93691debe0c3
2022-03-11 07:55:42 +00:00
Marie Matheson
21ac5e7d94 Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9df3 am: 8bb49c90cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17142588

Change-Id: Ic6c1efe682ed768994f189cc7cbaea99d972de27
2022-03-10 20:28:14 +00:00
SongFerngWang
506c3df5b9 [MEP] sort the simSlotMapping by logcal slot id
The modem assign the simSlotMapping like UiccSlotMapping[
(mPortIndex=0, mPhysicalSlotIndex=0, mLogicalSlotIndex=1),
UiccSlotMapping (mPortIndex=1, mPhysicalSlotIndex=0,
mLogicalSlotIndex=0)]. The settings replace the first one
UiccSlotMapping when user insert psim and the both of esim
profile are not enabled. It is not correct. The root cause is that
the settings did not sort the simSlotMapping by logcal slot id.

Bug: 223662007
Test: atest UiccSlotUtilTest  (PASS)
Change-Id: I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85
2022-03-11 02:58:55 +08:00
Marie Matheson
0b82bf9df3 Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev 2022-03-10 13:40:54 +00:00
Marie Matheson
a0ce0e6340 Bug fix - when enrolled, biometrics have ok safety state.
Bug: 222336582
Test: atest SettingsUnitTests
Change-Id: Ia90329fa126b181e87ff7ed626ba33eca1e6bf7d
2022-03-09 19:24:18 +00:00
Ricky Wai
d09d62a55e Apply restricted settings to notification access.
Bug: 202130031
Test: Able to boot without error
Test: When app is installed by PackageInstaller app, notification
access is being restricted. The restriction is being removed after
turing it restricted settings off for that app.

Change-Id: I9c1fbc80dd2ca4cc483a60dfa9d043aaa99cde87
2022-03-09 16:51:09 +00:00
tom hsu
6fc5bb64dc [Panlingual] Revamp the panlingual UI in Settings.
- Create a Activity to contain AppLocaleDetail and
    LocalePickerWithRegion
  - Update the Entry from apps language page

Bug: 223089715
Test: local test pass
Change-Id: Id01e93f3df32412c7323ca577a149009eb1862ad
2022-03-09 17:06:33 +08:00
Marie Matheson
386fdd46a4 Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287

Change-Id: I2211e10d3b8ad36c25a428d51c66d95c12e686f4
2022-03-08 14:34:33 +00:00
Marie Matheson
2adf0a066f Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev 2022-03-08 14:02:57 +00:00
Yuri Ufimtsev
2ea378651c Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563

Change-Id: I63c748656f255d1d795558594a8d2b214bd98eee
2022-03-08 12:34:02 +00:00
Marie Matheson
cc97297375 Minor bug fixes for Lockscreen Safety Center source
- use correct severity enum for issues
- update biomterics on lockscreen change
- clean up some nearby tests to use eq matcher instead of captor

Test: SettingsUnitTests
Test: Manually tested
Bug: 223170514
Bug: 222338885
Change-Id: I4e28a418473cbe7cd5d75daf0d62776654fa7917
2022-03-07 20:02:56 +00:00
Yuri Ufimtsev
f15bebe6c3 Inject different User IDs into biometric utils
Test: atest SettingsUnitTests

Bug: 222217132
Change-Id: I7939d78817f53814d0f8fb4636231a4833fbe26a
2022-03-07 10:04:25 +00:00
SongFerng Wang
3254fc9703 Merge "In E+E, the user can't enable the PSIM" into tm-dev am: bdd37ce348
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17092188

Change-Id: I2adc398e5c374cb9efd55778da1ff8c64ee96cfb
2022-03-07 07:56:40 +00:00
SongFerngWang
68cfaafe73 In E+E, the user can't enable the PSIM
In the E+E and there is the empty slot, the user can't enable PSIM.
Since the settings can't set the correct simSlotMapping.

Bug: 222231991
Test: atest UiccSlotUtilTest (All passes) and Build pass
Change-Id: Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec
2022-03-07 12:44:00 +08:00
Amy Hsu
c8f9f36273 Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev 2022-03-04 06:24:08 +00:00
SongFerng Wang
eeb16a306f Merge "[MEP] psim's logical slot index is 0" into tm-dev 2022-03-04 05:57:55 +00:00
Amy Hsu
372bbdcf9c Add summary and footer message for the ScreenResolutionFragment.
Bug: b/199559703
Test: Check resolution switch UI in Settings app
      atest SettingsUnitTests:ScreenResolutionControllerTest
      atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
(cherry picked from commit d633cd6b32)
Merged-In: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
2022-03-04 02:45:15 +00:00
Amy Hsu
27ad4dcf23 Merge "Add ScreenResolutionController to Settings app" into tm-dev 2022-03-04 01:08:00 +00:00
TreeHugger Robot
5ccb07df85 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev 2022-03-04 00:57:08 +00:00
Karishma Vakil
78cedba480 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod am: bc84aad406
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17037303

Change-Id: Ia2008c5fc5b218b44278cde026ad87f0a9cad19c
2022-03-03 20:31:00 +00:00
Karishma Vakil
bc84aad406 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod 2022-03-03 20:09:15 +00:00
Ricky Wai
2c01ba574b Merge "Apply restricted settings to notification access." 2022-03-03 17:47:02 +00:00
SongFerngWang
0b948c827b [MEP] psim's logical slot index is 0
psim's logical slot index is 0, so changing the API and adding test
cases.

Bug: 221839363
Test: atest UiccSlotUtilTest
Change-Id: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
(cherry picked from commit b162438b5d)
2022-03-03 17:14:44 +00:00
SongFerng Wang
da07d7fce4 Merge "[MEP] psim's logical slot index is 0" 2022-03-03 17:13:34 +00:00
SongFerngWang
b162438b5d [MEP] psim's logical slot index is 0
psim's logical slot index is 0, so changing the API and adding test
cases.

Bug: 221839363
Test: atest UiccSlotUtilTest
Change-Id: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
2022-03-03 20:56:40 +08:00
Ricky Wai
a137158f2c Apply restricted settings to notification access.
Bug: 202130031
Test: Able to boot without error
Test: When app is installed by PackageInstaller app, notification
access is being restricted. The restriction is being removed after
turing it restricted settings off for that app.

Change-Id: I9c1fbc80dd2ca4cc483a60dfa9d043aaa99cde87
2022-03-03 11:20:21 +00:00
tom hsu
ea9e627c1c [Panlingual] Improve UI can not show on at first.
- Settings take much time to get the info of app launcher entry. User
    may not see the panlingual UI at first after boot to home.
  - Does small refactor to somewhere.

Bug: 218416193
Test: local
Test: atest pass
Change-Id: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591
(cherry picked from commit cae20ce2f7)
Merged-In: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591
2022-03-03 08:39:20 +00:00