Faye Yan
b5aab77162
Revert "Add Voice activation apps into Settings->Apps->Specific app->AppInfo->Voice activation apps"
...
This reverts commit 7f2fbc2e4c
.
Reason for revert: voice activation is not going in V
Change-Id: Idfabfd48f45d2ace7de9f8498181f281ad0358a1
2024-04-04 21:02:46 +00:00
Weng Su
98ab104f20
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours am: 1f57fe8c0e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I6ecbd3c83f7619a54e76007f3b285dc6d3386227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:51:12 +00:00
Weng Su
b70ace131b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 146d51f2cc
am: 1f2fc04f17
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I49b5c401f9b0dcafe7cf65e9b5d37b9203951d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:36:03 +00:00
Weng Su
1f57fe8c0e
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I97155789f7e3b2dc9698ce955a8e7b3236f5722e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:33:54 +00:00
Weng Su
03dd808b90
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 34b0650655
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I6ac752afb4fdcb6d59d039f0eb3467ea5ea7be9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:20:55 +00:00
Weng Su
70d03ec35b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I190f6f720fa4a6f1fe6f737414a2b8f485a5a4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:13 +00:00
Weng Su
1f2fc04f17
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 146d51f2cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: If2fb5dea84a4e7f26186a062bd9b946709642da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:04 +00:00
Weng Su
34b0650655
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I28bc46ff37bf11a9fa6b92eaa78c6d77f7cd4e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:48 +00:00
Weng Su
146d51f2cc
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I2f57a28bbc46a1f648d6ecf0a72eab3a884e69e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:34 +00:00
Weng Su
4a93bd9f39
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I1c23b0952d7e372848fe7486f2efea34b94e9253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:11 +00:00
Hao Dong
617c73cd37
Merge "Show "no thanks" button when scroll is not needed." into main
2024-04-04 18:17:35 +00:00
Joseph Vincent
0882f3c105
Merge "Remove "skip lock screen" from private profile face setting" into main
2024-04-04 17:56:54 +00:00
Olivier Nshimiye
f195e8bfec
Merge "Remove 'Hide Sensitive Notifications' item from PS settings page" into main
2024-04-04 17:08:04 +00:00
Aleksandr Lukin
80d12dbc25
Merge "Split System category" into main
2024-04-04 15:25:15 +00:00
alukin
f4329ada00
Split System category
...
Splitting System category in
Settings > Storage into "Android 14"
and "Temporary system files".
Android 14 is calculated as
StorageStatsManager#getTotalBytes - (size of /data partition).
Basically it's the size of all partitions
except for the userdata. It also includes
the storage rounding which we do to display
a nice round storage size (128GB, 256GB, etc).
Temporary System Files serves as "Everything else"
category that represents all the used storage
that didn't fall under any other category.
It's the same as how currently "System" category works.
Bug: 309801699
Test: atest StorageItemPreferenceControllerTest
Test: atest StorageCacheHelperTest
Change-Id: Ifae5819bf1d7a1a675df1fa67bd6dcdfa074b584
2024-04-04 13:26:07 +00:00
Joseph Vincent
2f8efa0633
Merge "Support face unlock for PS if class2 biometric and above" into main
2024-04-04 13:03:31 +00:00
Joseph Vincent
727ec97362
Merge "Fix for test failure in PrivateSpaceMaintainerTest" into main
2024-04-04 11:10:12 +00:00
josephpv
fecb6062ba
Remove "skip lock screen" from private profile face setting
...
This change removes toggle "skip lock screen" from private profile face
unlock settings page.
screenshot : go/ss/BgucXsP9FRk23SM.png
Bug: 320702155
Test: Manual
Change-Id: Ibcd83edb1a93a4cd4b33c672f32e3b90328060ea
2024-04-04 10:47:41 +00:00
Olivier Nshimiye
7851c33bbd
Remove 'Hide Sensitive Notifications' item from PS settings page
...
Remove the hide sensitive notifications toggle, but keep private space sensitive notifications always hidden on lockscreen
Bug: 329657118
Test: atest PrivateSpaceMaintainerTest
Test: Manual - verified that PS sensitive notifications are always hidden on lockscreen.
Change-Id: Id4229c11a2c5a3a4d3fedaf710c51f25af64bf86
2024-04-04 09:40:36 +00:00
Hao Dong
6cef7bac2d
Show "no thanks" button when scroll is not needed.
...
Test: atest FingerprintEnrollIntroductionTest
Bug: 328019857
Change-Id: Ia9e9be3a5a4c89e1d01e597730da5bfc2a5483ad
2024-04-04 04:59:14 +00:00
josephpv
1108e206f4
Fix for test failure in PrivateSpaceMaintainerTest
...
Bug: 332488382
Test: atest PrivateSpaceMaintainerTest
Change-Id: Id6a18305f03f45c580ada482a352d1d7ad3dd788
2024-04-03 22:23:05 +00:00
josephpv
4e32375f3d
Use canAddPrivateProfile() to enable PS delete from Reset
...
This change adds canAddPrivateProfile() check to enable/disable
Private space delete controller in Reset options.
Matches the availability to delete private space from reset
options with the conditions used to show the private space entry point.
In Settings Reset options preference to delete private space will be
shown only when private space creation is allowed on the device or if
private space already exists on the device.
Bug: 330396315
Test: ResetOptionsDeletePrivateSpaceControllerTest
Change-Id: I63232556f7927aeb07b73e8732bbb8b1d2423456
2024-04-03 20:39:12 +00:00
josephpv
1791ce216b
Support face unlock for PS if class2 biometric and above
...
With this change it is checked if face unlock is supported as a class2
or class3 biometrics on the device.
If face is convenience biometrics then face unlock for
private space controller is not added.
Bug: 329044103
Test: atest UtilsTest and verified Face unlock is not added if face is convenience
Change-Id: I6e1a6557774be1173ad3ee7ff7b14d51f9fe1716
2024-04-03 19:09:40 +00:00
Becca Hughes
bc48abe0bd
Merge "Update title of settings page to reflect updated mocks" into main
2024-04-03 18:21:17 +00:00
Joseph Vincent
bc61497448
Merge "Revert^2 "Add waiting screen before PS setup completion"" into main
2024-04-03 17:41:52 +00:00
Becca Hughes
6eb971c80f
Merge "Pass the package name from the intent to the picker fragment" into main
2024-04-03 17:23:49 +00:00
Joseph Vincent
0fee5fa0b0
Revert^2 "Add waiting screen before PS setup completion"
...
This reverts commit d2c91b587e
.
Reason for revert: Landing the original cl as the test passes locally with changes and failed test looks to be flaky and not related to the change.
Failure is not seen in the ABTD test run results with this CL b/331935387#comment10
Change-Id: I744e11a04b70e265c5dcfe5aa8db7237561f3a08
2024-04-03 16:36:21 +00:00
Harry Cutts
46e5fd8c28
Touchpad: add final strings for tap dragging
...
The title string was approved by UX as it is, so mark it as ready to
translate, and add a summary line.
Screenshot: go/b-324058706-strings-screenshot
Bug: 324058706
Bug: 321978150
Change-Id: Iaa757be16b58b23fba8a6841621ad8000b51c250
Test: Open touchpad settings, check new summary line appears
2024-04-03 14:27:42 +00:00
Chaohui Wang
9cfbe60998
Merge "Use SpaDialogWindowTypeActivity for WEP dialog" into main
2024-04-03 09:07:53 +00:00
Treehugger Robot
cdd9b78e22
Merge "Restrict WifiDppConfiguratorActivity" into main
2024-04-03 08:18:15 +00:00
Yi Shiou (Les) Lee
c310438a82
Merge "wifi: Using framework uri parsing" into main
2024-04-03 07:58:52 +00:00
Weng Su
254ba087c2
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 07:50:24 +00:00
Chaohui Wang
51a4bea7d9
Use SpaDialogWindowTypeActivity for WEP dialog
...
TODO: Set different window type when called from Quick Settings.
Bug: 332643450
Test: am start -n com.android.settings/.network.WepNetworkDialogActivity
Change-Id: Ie888e7cc116234199316b030fb5f35dea6dbb3ac
2024-04-03 15:26:26 +08:00
Samuel Huang
854785bebb
[automerger skipped] Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev am: 9c5ce0172f
-s ours
...
am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f35
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784704
Change-Id: I869538899dd5271eb93f7a75dfffa3fa5bc7d38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-03 05:05:50 +00:00
Samuel Huang
a06c66622a
[automerger skipped] Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook am: c6e13c10c4
-s ours
...
am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f35
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784704
Change-Id: I3e0be83aa9e0d72ca5b41713030f91e9dde3d6e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-03 05:05:44 +00:00
Les Lee
1635951de2
wifi: Using framework uri parsing
...
Bug: 298669190
Test: Manual test. Qr code sacnning works normally.
Change-Id: I8e6138971ae6798b42db32930f80e9113a8c0223
2024-04-03 04:59:22 +00:00
Samuel Huang
9c5ce0172f
Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev
2024-04-03 04:48:24 +00:00
Weng Su
0ea027a71c
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 03:52:07 +00:00
Chaohui Wang
43ce1c4abf
Merge "Correct the data usage warning" into main
2024-04-03 03:38:07 +00:00
Jason Chang
edb0ff11e1
Merge "Fix face unlock setup page is abnormal" into 24D1-dev am: d245c1108a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784347
Change-Id: Iaa927a8b3f6df29d634bfb6baacdb96aeb415899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-03 03:25:00 +00:00
Jason Chang
d245c1108a
Merge "Fix face unlock setup page is abnormal" into 24D1-dev
2024-04-03 03:14:13 +00:00
Weng Su
2101258e8a
Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 10:45:43 +08:00
Treehugger Robot
f6c7511996
Merge "[Settings] fix Settings crash on App info for archived apps" into main
2024-04-03 00:14:45 +00:00
Hakjun Choi
0c2927a234
Merge "Make satellite more info url carrier configurable" into 24D1-dev am: df0ea6c723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26684988
Change-Id: I274e82a7cd279625ceb9ddda8442bbaf3d746ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 23:19:43 +00:00
Hakjun Choi
df0ea6c723
Merge "Make satellite more info url carrier configurable" into 24D1-dev
2024-04-02 23:03:24 +00:00
Marcus Ge
c3f57aa3ba
Merge "[Accessibility] Restore high contrast text" into main
2024-04-02 22:57:40 +00:00
Songchun Fan
faeaa7650e
[Settings] fix Settings crash on App info for archived apps
...
For archived apps, isClearRestrictionAllowed (introduced in ag/26048774)
can throw NameNotFoundException, which causes Settings app to crash if
uncaught. This CL fixes that.
Test: manual by archiving an app and then try to go to it's app info
page
BUG: 332397754
Change-Id: I49a39dba36261f36215f0389ffe41523e8a2f4e8
2024-04-02 22:09:57 +00:00
Joshua Mccloskey
90552bb255
Merge "Removed period from fp delete dialog." into main
2024-04-02 19:24:08 +00:00
Bill Yi
06466ee253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: d52215885e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793743
Change-Id: I0c6116b55005219f33e7533a0aa391e74334db60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 19:04:40 +00:00
Bill Yi
1449377090
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb74a16786
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793743
Change-Id: I874d98fe1e9c3b1e8295ff481784c7ddb8a47434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 19:04:27 +00:00