Arc Wang
cef3637f4c
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I93f85b0182921a010b4bd16f3d7116590144016c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 11:18:17 +00:00
Arc Wang
e3a8b88137
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I8e350dafebac6347f599d4fbb52100c8e8fa5474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 11:18:13 +00:00
TreeHugger Robot
c3d11c8f6a
Merge "Purging battery diff data before calculating perctage and sort."
2022-12-16 10:54:43 +00:00
jasonwshsu
1cc2ccc499
[hearing devices page] Add feature flag to control visibility of the hearing devices page
...
* Setup basic xml for hearing devices page
Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidsFragmentTest
Change-Id: I3cc794e124d1dfda46f8d5fba658de47f84b63f5
2022-12-16 18:29:56 +08:00
Vania Januar
44cb400f95
USI Stylus settings Fragment.
...
The USI stylus settings fragment shows specific preferences
for USI stylus devices only.
There is currently no way to access this fragment from the UI.
Bug: 251201006
DD: go/stylus-connected-devices-doc
Test: StylusUsiHeaderControllerTest
Change-Id: I18223abc8113dce977f57f930ba701da0a34cc18
2022-12-16 10:11:42 +00:00
Bonian Chen
d68d0df940
[Settings] Code refactor - reuseable layout extration
...
This is a change to extract EID layout for easily moving it to somewhere
else.
Bug: 260540995
Test: local
Change-Id: Ic7eb257d8d6b30564bc1a63c9b35676784c13d81
2022-12-16 09:18:19 +00:00
TreeHugger Robot
11a4853410
Merge "Safely remove Wi-Fi user credentials"
2022-12-16 08:44:57 +00:00
Zaiyue Xue
b9b3dcc0fb
Purging battery diff data before calculating perctage and sort.
...
Bug: 261820602
Test: manual
Change-Id: I958995721238f32d0360861559ca5e1938ce6d3a
2022-12-16 16:24:12 +08:00
Weng Su
0e15574e84
Merge "Create Helper Classes for WifiTrackerLib"
2022-12-16 08:18:14 +00:00
Chaohui Wang
9e32ea9d0c
Merge "Move AppItem into AppListModel"
2022-12-16 07:27:04 +00:00
YK Hung
0645cbbbea
[automerger skipped] Merge "Move setup optimization mode to main thread" into tm-qpr-dev am: 3aca71cfc2
am: ea082976a6
-s ours
...
am skip reason: Merged-In I2de2181321712f89fadc04bf5000aea91a01485a with SHA-1 7423f4390c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742652
Change-Id: I346ec2ca57ae384a3b58b3d33c4498c642a4c50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 06:06:35 +00:00
YK Hung
0b826de287
Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c68f
am: e7ec6ee025
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827
Change-Id: I9db48b168b17dc7d7de50f9af15b9bf27f9419c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 06:06:08 +00:00
YK Hung
a8e2ded389
Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809
am: cf8ab7eef3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066
Change-Id: I3ef80837be675684e595f47cfe886a198992d167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 06:04:43 +00:00
TreeHugger Robot
f8b8835761
Merge "Refactor getting allowlist set from feature provider."
2022-12-16 05:45:52 +00:00
YK Hung
ea082976a6
Merge "Move setup optimization mode to main thread" into tm-qpr-dev am: 3aca71cfc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742652
Change-Id: I78b78a50b032cacfa2ab4180e594018556d0377b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 05:25:05 +00:00
YK Hung
e7ec6ee025
Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c68f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827
Change-Id: I7d3f436b5e7da6c380402014813d0233c55b0b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 05:24:33 +00:00
YK Hung
cf8ab7eef3
Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066
Change-Id: I271e279c86e90360b9fae18f96dc8c913f9f430f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 05:23:35 +00:00
YK Hung
3aca71cfc2
Merge "Move setup optimization mode to main thread" into tm-qpr-dev
2022-12-16 04:53:06 +00:00
YK Hung
c89f78c68f
Merge "Update dock defender helper URL" into tm-qpr-dev
2022-12-16 04:52:18 +00:00
YK Hung
d388dc1809
Merge "Update string for all defenders" into tm-qpr-dev
2022-12-16 04:51:46 +00:00
Treehugger Robot
3b583fc371
Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" am: 8ac09942b6
am: a8abd64b73
am: 691ddd7f07
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311766
Change-Id: Ic3b54cb856ddf73f379db99404449aeb5980cc17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 04:47:12 +00:00
Treehugger Robot
691ddd7f07
Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" am: 8ac09942b6
am: a8abd64b73
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311766
Change-Id: I5d95061c4a22b21b003ffdc2272da8d15ab64b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 04:38:44 +00:00
Bill Yi
d66bae69fc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f902b8eb62ecf275d0b28869ee2fb7cad3c88e4
2022-12-15 20:33:51 -08:00
Bill Yi
b51c2c3fa1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib08c97638167c98333f7b6ee2c275d7562da185b
2022-12-15 20:30:34 -08:00
Treehugger Robot
a8abd64b73
Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" am: 8ac09942b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311766
Change-Id: I232c7163792ffe2643c0706075ea49f3aa0841ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 04:02:45 +00:00
TreeHugger Robot
d47234fb7d
Merge "Remove unused strings."
2022-12-16 04:00:00 +00:00
Treehugger Robot
8ac09942b6
Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager"
2022-12-16 03:44:18 +00:00
Zaiyue Xue
bce700f1db
Refactor getting allowlist set from feature provider.
...
(1) Use Set<CharSequence> for all the allowlists.
(2) The contains() method of Set<CharSequence> also works for String. No
need an extra contains() util function.
Bug: 262802531
Fix: 262802531
Test: presubmit
Change-Id: Ib2aaf9a3b8db4618a8c46f138e8d35f15b77c104
2022-12-16 10:39:26 +08:00
Bill Yi
f164782792
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-16 02:18:14 +00:00
Bill Yi
67bd2277c7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-16 02:18:14 +00:00
Bonian Chen
6d57edf9ac
Merge "[Settings] Change network reset into reset mobile network"
2022-12-16 00:41:16 +00:00
William Xiao
71ee3c3a5d
Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191aeb7
am: 26343e8926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709
Change-Id: I63dedfa49ec3d7c64c156d6a5da33772abfcc4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 00:04:15 +00:00
Yuri Lin
5db22756e4
Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev am: dc4100f148
am: de8a27b496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20725886
Change-Id: I4c0309a1b5773d6d92c0f43ba631571e2b375e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 00:00:17 +00:00
Bill Yi
5f08e8ace3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0d848cb0ac
-s ours am: fdcb8480d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: I35b03d27edbd36f305f6cf1d138c5910f16d590d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 23:15:31 +00:00
Bill Yi
d00fdfc8ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b66bdeb77f
-s ours am: 58b243bd47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: Iacb436e70a856583b8e65fb8d848dc5ba48aabef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 23:15:00 +00:00
Eric Biggers
5f1d894252
Remove EncryptionInterstitial for Full Disk Encryption
...
Support for Full Disk Encryption was removed in Android 13, since now
File Based Encryption is always used instead. It turns out that I
missed a fairly large chunk of obsolete code: EncryptionInterstitial,
which is the screen that asks whether the device will require the
primary user's lockscreen credential when it starts up. This used to be
shown when setting the primary user's lockscreen credential, to
determine whether the full-disk encryption key would be tied to that
lockscreen credential or not. But now it's unused code.
This CL removes all this unused code.
This should not change any behavior, with one very minor exception:
Settings will no longer explicitly set the REQUIRE_PASSWORD_TO_DECRYPT
setting to 0 whenever the primary user's lockscreen credential is
changed. (This happened in SaveChosenLockWorkerBase.) This setting is
a @SystemApi, but it no longer has any meaning, since it is never set to
1 anymore. If there is a reason to keep it explicitly set to 0, instead
of unset, we should make LockSettingsService in system_server set it.
Test: Went through SUW, set a PIN, cleared the PIN, set a PIN again (all
using the UI). Nothing unusual seen.
Bug: 208476087
Change-Id: I039cc7a284e3f43e1e284970a5869958c909d1b7
2022-12-15 20:47:20 +00:00
William Xiao
26343e8926
Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191aeb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709
Change-Id: I46a4c6300b2deb004417a78faaab25f10fd9ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 20:46:32 +00:00
William Xiao
0be191aeb7
Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev
2022-12-15 20:04:15 +00:00
Florian Mayer
2be085005b
Merge "[MTE] allow device policy to control setting"
2022-12-15 18:40:14 +00:00
Yuri Lin
de8a27b496
Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev am: dc4100f148
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20725886
Change-Id: I609c74ba96e7a32171ff20715d4aa8c68f8a68b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 16:51:30 +00:00
Yuri Lin
dc4100f148
Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev
2022-12-15 16:08:17 +00:00
Bonian Chen
8d43fd9a35
[Settings] Change network reset into reset mobile network
...
Replace reset network into Reset mobile network settings
Bug: 260034791
Test: local and auto
Change-Id: I9547f266c1586073fd2b96f35cc9df8861b0a105
2022-12-15 15:44:08 +00:00
Weng Su
28791f5ff0
Safely remove Wi-Fi user credentials
...
- Show "(In use)" if a credential is used by Wi-Fi networks
- Show Wi-Fi networks in use in the details dialog
- Disable "Uninstall" button if the credential is in use
Bug: 258542666
Test: manual test
atest -c UserCredentialsSettingsTest
Change-Id: I1fb29b58698d918f987b9a16c195127cf270c17e
2022-12-15 15:20:43 +00:00
Weng Su
ae8389165a
Create Helper Classes for WifiTrackerLib
...
- Create a WifiTrackerBase for the base worker thread
- Create a SavedWifiHelper for the saved Wi-Fi network tracker
Bug: 258542666
Test: manual test
atest -c WifiTrackerBaseTest \
SavedWifiHelperTest
Change-Id: Ie6b2f5b348367376da96737acdf5b8e65ecaf067
2022-12-15 15:19:47 +00:00
Bill Yi
fdcb8480d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0d848cb0ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: I94f490d83c21235c9c500c4a6fa8c2659dbe87fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 14:30:47 +00:00
Bill Yi
58b243bd47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b66bdeb77f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: I769be6cbdc13dcca0e325bef5558ee3abc66b73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 14:30:12 +00:00
Bill Yi
0d848cb0ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-15 14:08:52 +00:00
Treehugger Robot
2f96743835
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
am: 24835ea2f9
am: 8a26d010d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: I6b4edd0be16e090b56b628af51a0558c87822ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 13:41:13 +00:00
Treehugger Robot
8a26d010d0
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
am: 24835ea2f9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: Ie89e48f670b7e3cc8d8d607149d35c678b67ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 12:59:37 +00:00
Treehugger Robot
24835ea2f9
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: I5f73183e359038b48df0a83c4ce76c3dbc4cc42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 12:25:52 +00:00