Bill Yi
3f2f1212a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I23abdb70990b8472d4e2ee881a89df083cf064a6
2022-10-09 20:27:40 -07:00
Bill Yi
467155435c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I30d81e9920cda4cd5d07a1f07456c37b2ac94da3
2022-10-09 20:26:30 -07:00
Bill Yi
9d544547a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2e3506a75c1d9ce7cb51d0dec205e9ad79b1823d
2022-10-09 20:25:18 -07:00
Bill Yi
ad156a0b43
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If889f0eeac5a7cf12f1c796cebe9298cebaebaa3
2022-10-09 20:24:12 -07:00
Bill Yi
b172ac177f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b93ac2068db2bf0f94ea5158e4715f2360c7138
2022-10-09 20:23:13 -07:00
Bill Yi
c9a075a1e6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iad6adf581dc8d7aa95759ad3b86f307a7e9b8724
2022-10-09 20:20:20 -07:00
Chaohui Wang
41716cd24e
Update onPermissionSummaryResult()
...
standardGrantedPermissionCount is removed.
Bug: 236346018
Test: m Settings
Change-Id: Id1b6a7d5302416f073e342d5b0d70b9b3dd102f0
2022-10-09 19:36:40 +08:00
Chaohui Wang
107109c4ac
Merge "Clean up unused AppPermissionsPreferenceController"
2022-10-09 09:51:52 +00:00
Chaohui Wang
a947e88c9f
Clean up unused AppPermissionsPreferenceController
...
This one is replaced by AppPermissionPreferenceController.
Bug: 234570979
Test: m Settings
Change-Id: Id9d16caf33cdea626f79a3cd142dfcde2c54769f
2022-10-09 15:42:01 +08:00
Chaohui Wang
4e35f2596b
Apply restricted by admin to the disable button
...
Currently, we apply the same device policy for both the uninstallation
and disable button.
Also, not double check whether a package is admin (device owner or
profile owner).
Bug: 236346018
Test: Manual on App Settings page
Change-Id: If081fd8ff5422eeac931076a18f73632132a528c
2022-10-09 13:09:40 +08:00
Shen Lin
97a61bad7d
Add fallback summary text if there is no matching screen timeout value
...
Screen timeout summary string can be null if there is no matching candidate, so we need a fallback summary here to avoid showing unexpected summary text.
Bug: 252340891
Test: manual
Change-Id: I939ae97a50063b2ffe84029135c3f340aeedf4c7
2022-10-09 01:59:02 +00:00
TreeHugger Robot
88f9c8fe7e
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096
am: 45bab9ddc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050
Change-Id: Ia6c96f2c1f1ea869f1fdaebeebd977b0e1612263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-08 07:53:32 +00:00
TreeHugger Robot
996a6848e0
Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d33
am: 0b79b2ed99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575
Change-Id: I5105e56934854a74bb05b90577b9853e74f41b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-08 07:53:16 +00:00
TreeHugger Robot
45bab9ddc4
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050
Change-Id: I68b6a8afeb51b04b1c48cf7e4c94e6e9ff5f346e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-08 07:21:06 +00:00
TreeHugger Robot
0b79b2ed99
Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575
Change-Id: I621842329767134c1a18baafa3f125dd1ca49c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-08 07:20:50 +00:00
TreeHugger Robot
4fd86cc096
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev
2022-10-08 06:54:15 +00:00
TreeHugger Robot
d776340d33
Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev
2022-10-08 06:53:35 +00:00
Evan Severson
38eb8fea44
Merge "Make SensorToggleControllers lifecycle aware"
2022-10-07 19:11:16 +00:00
Jared Duke
5c23de9904
Merge "Refine Settings proguard rules"
2022-10-07 16:07:39 +00:00
SongFerng Wang
bd131dafc2
Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6
am: 97d375875a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005
Change-Id: Ie22a7f98e2c52bcf03acdc5910cbdd762f5bba84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-07 14:42:32 +00:00
SongFerng Wang
97d375875a
Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005
Change-Id: Id8b05f8faaadee52922e785b6e15c40eb1dd12de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-07 14:09:58 +00:00
Howard Chen
11f4bbe5ea
Merge "Resize the DSULoader dialog dynamically"
2022-10-07 13:36:32 +00:00
SongFerng Wang
da58404ea6
Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev
2022-10-07 11:04:22 +00:00
Josh Hou
c01034ebd1
[Panlingual] Separate the app locale information by profiles
...
Fix not seeing apps with the LocaleConfig in the app language selector of Settings.
Bug: 239054437
Test: Manual
Change-Id: I4db78300b63e6fda2890383c097bb46102084d95
2022-10-07 17:24:48 +08:00
TreeHugger Robot
2d83f8b5bf
Merge "Show policy transparency dialog if adding Wi-Fi config is not allowed"
2022-10-07 08:12:56 +00:00
Lauren Winston
3f8d62fbf1
Revert "Add toggles for two Software Cursor settings: keyboard shift and trigger"
...
This reverts commit 28b4b34f92
.
Reason for revert: Software Cursor is not launching in Android U
Test: manual
Change-Id: I213cf64ca94fce51883a30a9d6b734b4ed874dad
2022-10-06 23:58:50 +00:00
Xin Li
302b01f8e2
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
...
Bug: 248070379
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
Change-Id: Ib8c6441f2165784804a1863bcfce6b05d20ecfd3
2022-10-06 12:22:57 -07:00
Weng Su
a81bb19618
Show policy transparency dialog if adding Wi-Fi config is not allowed
...
- When the user is restricted by UserManager.DISALLOW_ADD_WIFI_CONFIG, clicking on a Wi-Fi network will show the Settings policy transparency dialog.
- The "Not allowed by your organization" summary in Wi-Fi networks will be removed in a separate CL.
Bug: 233871529
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=Wifi
Change-Id: Ia978be8e85a5809de1331f3e0edc11fbc8925c80
2022-10-07 02:34:49 +08:00
Jared Duke
4c8bae742b
Refine Settings proguard rules
...
Avoid keeping unused library classes and remove several redundant rules.
This saves ~700KB dex and a modest amount of Jetpack resources that are
no longer referenced.
Bug: 248580093
Test: m + presubmit + atest SettingsUnitTests
Change-Id: Ic2398345a35117ccab433d2fd1c31c0f453ed77c
2022-10-06 09:10:38 -07:00
Howard Chen
5f0c62f6bc
Resize the DSULoader dialog dynamically
...
Bug: 246686308
Test: Open the DSULoader and check the space
Change-Id: I1f71e6874a322be5456ae4dd9fe9bcca792bd593
2022-10-06 20:04:41 +08:00
Wesley Wang
c8e077368f
Fix battery saver number format issue
...
- The summary of battery saver scheduler use util to convert the number
but saver sticky preference use another way to convert it, update
them to use the same convert method
Bug: 250684701
Test: make SettingsRoboTests
Change-Id: I4f188a2e8e9d4810d187b870e331dc84f50b2b6f
2022-10-06 10:23:28 +00:00
Milton Wu
328be58b48
Do not show 2nd FingerprintErrorDialog
...
When fingerprint enrollment is stopped because of credential timeout, it
pops a FingerprintErrorDialog, and this error dialog triggers
onWindowFocusChanged(), and the 2nd FingerprintErrorDialog is shown. To
fix this case, checking mIsCanceled flag do nothing in
onWindowFocusChanged() method.
On the first dialog, the 'Try again' button relaunch activity with new
Intent, and it causes that activity result fails to pass back to caller.
To fix this bug, add FLAG_ACTIVITY_FORWARD_RESULT on new Intent to pass
result back.
Bug: 248165760
Test: Manually test credential timeout behavior and dialog buttons
Test: Manually test enrollment process has been cancelled for scenarios,
like "Swipe down Notification Shade" and "Recents"
Test: robo test for FingerprintEnrollEnrollingTest
Change-Id: I4441ba026db9b594f1d6184280668a374126a2fb
2022-10-06 15:40:51 +08:00
TreeHugger Robot
848dab0ad3
Merge "Refine the verified links preference"
2022-10-06 06:24:32 +00:00
Zoey Chen
5e00d76432
Merge "[Settings] Add the repository for room database"
2022-10-06 06:18:59 +00:00
Alice Kuo
4adf54574d
[automerger skipped] Remove A2dp offload disabled and LE audio offload enabled combination am: 6ecbe4c18e
-s ours am: ba98d1839f
-s ours
...
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 7cc845026c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20126030
Change-Id: If3857ce44db5821779e40777877eff1435c36596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-06 05:05:21 +00:00
Alice Kuo
ba98d1839f
[automerger skipped] Remove A2dp offload disabled and LE audio offload enabled combination am: 6ecbe4c18e
-s ours
...
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 7cc845026c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20126030
Change-Id: I53940a801940e9dc2cd189a56ef1f256a6abd75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-06 04:30:08 +00:00
Alice Kuo
6ecbe4c18e
Remove A2dp offload disabled and LE audio offload enabled combination
...
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
as well
Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
(cherry picked from commit 7cc845026c
)
2022-10-06 10:35:03 +08:00
Xin Li
bf8789b38d
[automerger skipped] Merge "Merge TP1A.221005.003" am: 2af8366306
am: ec0cf19aad
-s ours am: b59986a3f0
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 5e785a2d99
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893
Change-Id: Iacc6198ddf45333da944e4566414fbdddc2ec8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-06 00:53:36 +00:00
Xin Li
b59986a3f0
[automerger skipped] Merge "Merge TP1A.221005.003" am: 2af8366306
am: ec0cf19aad
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 5e785a2d99
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893
Change-Id: I68ff599414f5230a31efc34d80bdf6808c25727c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-06 00:32:43 +00:00
Xin Li
ec0cf19aad
Merge "Merge TP1A.221005.003" am: 2af8366306
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893
Change-Id: Ic9f25644a305419732cb5406b96166e8708a3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 22:39:29 +00:00
Xin Li
2af8366306
Merge "Merge TP1A.221005.003"
2022-10-05 22:20:14 +00:00
Treehugger Robot
c6c8515d00
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
am: bf19bf23a5
am: b969c8a4c7
am: ff788fa9b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I57bbacb82d15770d21a45b9043a8954ec268bf62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 18:23:43 +00:00
Treehugger Robot
ff788fa9b9
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
am: bf19bf23a5
am: b969c8a4c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I011b9815444d73b85b470db94d0bb53f5479c51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 17:54:58 +00:00
Treehugger Robot
b969c8a4c7
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
am: bf19bf23a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: Ibae8540c83dbabec5cf5bfa96ddaab3219ec5b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 17:26:59 +00:00
Zoey Chen
67ad5a31d7
[Settings] Add the repository for room database
...
Bug: 236919685
Test: manual
Change-Id: I7f32e4eb6a976091e285ef43abcd45a9d16a6ca9
2022-10-05 17:16:41 +00:00
Treehugger Robot
bf19bf23a5
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I3db9d784789e88ee04f50f040eb3741a87768640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 16:59:01 +00:00
Treehugger Robot
fe38c3c91e
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I4ecfd48d3e62eeaf01452283111d2ddaf7acb29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 16:26:25 +00:00
Treehugger Robot
bcde51cf09
Merge "Remove A2dp offload disabled and LE audio offload enabled combination"
2022-10-05 16:04:05 +00:00
Neil Fuller
15910795f2
Merge "Track method renames"
2022-10-05 15:45:42 +00:00
TreeHugger Robot
8e74ee57d1
Merge "Fix CtsIntentSignatureTestCases android.signature.cts.intent.IntentTest#shouldNotFindUnexpectedIntents"
2022-10-05 06:20:55 +00:00