Treehugger Robot
d2b684f678
[automerger skipped] Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
am: edc1304cc5
-s ours
...
am skip reason: Merged-In I2e63431cd0d8cf4712fc278646627fbf34a2b542 with SHA-1 34d308924e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056
Change-Id: Ica6cd4f9c4a2e0e4a37e55bee73d26ca96f4440b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 19:44:12 +00:00
Peiyong Lin
574928e691
[automerger skipped] [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
am: e92284ced1
-s ours
...
am skip reason: Merged-In Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250 with SHA-1 774378530f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055
Change-Id: Ia616aa2e280da7ba4ff14144dea2e02873e8a69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 19:44:09 +00:00
Peiyong Lin
320e827a5e
[automerger skipped] [Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
am: 24503938b9
-s ours
...
am skip reason: Merged-In I4f856ee1912a59052a6aaf7dff087ce1b649935e with SHA-1 39eb3a5ad0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036
Change-Id: I0f8a5a4cc4ed3e3d79fcc24f21e3a75c0c203de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 19:44:03 +00:00
Xin Li
d122c78e33
[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 7b262e34b7
-s ours
...
am skip reason: Merged-In Ib02ae9caef06a46938947806dac8aabb1fa12d94 with SHA-1 8319a77527
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25089548
Change-Id: I2c5776dad94dbcd3bb1e69bf5a6727d549ebf3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 18:50:49 +00:00
Xin Li
0c4f756bca
[automerger skipped] Merge 10952656 am: 596efc7e94
-s ours
...
am skip reason: Merged-In Ib02ae9caef06a46938947806dac8aabb1fa12d94 with SHA-1 8319a77527
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25089548
Change-Id: I597c0f2631f2c8674b549757f0dcf60ab114f65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 18:47:43 +00:00
Xin Li
7b262e34b7
Merge "Merge 10952656" into aosp-main-future
2023-10-19 17:58:36 +00:00
Guojing Yuan
70031a6709
Merge "Add a test for the NPE case" into main
2023-10-19 17:10:25 +00:00
Chaohui Wang
2af7db29bd
Merge "Remove NetworkProviderSimsCategoryController" into main
2023-10-19 12:53:38 +00:00
FanWu
9d22050a44
Ignore flaky test case to unblock presubmit
...
Bug: 291809013
Test: ignore test CL, doesn't affect any existing logic.
Change-Id: I4c3efb056692a6b8736a2cac350f65078f33bb79
2023-10-19 11:08:10 +00:00
Jason Chang
fdf80bd5c9
Revert fixing the style of Choose screen lock wasn’t consistent
...
in initial setup and deferred setup
Bug: 301383804
Test: manually test with reproduciable steps in PO mode:
1. Set up offline and skip initial setup.
2. Navigate to home screen.
4. Connect to WiFi.
3. Sign in corp account during deferred setup.
5. Navigate to screen lock setup.
4. When landing on Choose screen lock, observe the behavior.
Change-Id: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
2023-10-19 11:05:24 +00:00
Josh
58fe7197cd
Added width specs when creating brightness dialog from settings
...
The new default width for brightness slider UI is half width when in
landscape mode. However for settings we want full width, now settings
will also send a boolean along with the Intent to start brightness
dialog activity, specifying that the width of the brightness dialog
should be full width.
Test: open settings->display. click or press "Brightness Level" and
check that the brightness slider UI takes the full width of the right
hand pane of settings
Fixes: 303633970
Change-Id: Id40112c652e518b14cf000c791b7965bbb0991cd
2023-10-19 10:36:11 +00:00
YK Hung
f0135418d0
Merge "Fix uninstalled app original uid should not be 0" into main
2023-10-19 09:12:38 +00:00
Yiyi Shen
f8da70ac94
Add flag for LE audio sharing.
...
Bug: 305620450
Test: Manual
Change-Id: I61a1653419654eb21f70c583d8929baf6a433dbb
2023-10-19 16:46:14 +08:00
Chaohui Wang
d1577c5e68
Remove NetworkProviderSimsCategoryController
...
Which no real logic in it, just a proxy of
NetworkProviderSimListController.
Bug: 302628642
Test: manually - on MobileNetworkListFragment
Test: robo test
Change-Id: I4785ac9509f92f5a778e1bda1f8da12e2880589e
2023-10-19 15:56:22 +08:00
Chaohui Wang
9a437cb696
Merge "Dismiss the open dialog if preference is disabled" into main
2023-10-19 07:51:03 +00:00
Jun Lan
28088dc64b
Fix uninstalled app original uid should not be 0
...
Context: some special packages have uid but 0. Those packages should not
be part of uninstalled apps.
Test: manual
Bug: 264339271
Fix: 264339271
Change-Id: I86874691b0a837335c2e5352d1d0c6be8df8a2e4
2023-10-19 15:34:33 +08:00
Treehugger Robot
6162983cae
Merge "Add back title in xml" into main
2023-10-19 03:38:10 +00:00
Eric Biggers
fd1e089b4c
Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
am: 3eb12fab5e
am: 81afb5c097
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955
Change-Id: I8ba1eac7a6194410bf574ee3a7a7157471939ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 01:22:26 +00:00
Eric Biggers
81afb5c097
Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
am: 3eb12fab5e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955
Change-Id: I72d1606782200e7f1b16a0617439b38c4916523e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 00:33:18 +00:00
Eric Biggers
48e63162ef
Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955
Change-Id: I77def55762894cf041e3b5f5eff6ec5552403f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 00:05:43 +00:00
Eric Biggers
3eb12fab5e
Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955
Change-Id: If4352c5ae76251422fefa6f0aef7838c34a85266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 00:05:20 +00:00
Eric Biggers
fcaf0aceeb
Merge "Unlock non-secure users automatically (2/2)" into main
2023-10-18 23:50:43 +00:00
Xin Li
596efc7e94
Merge 10952656
...
Merged-In: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Change-Id: Ib1f728fef6241ddd7a2ce1522093f4a62a4a9d81
2023-10-18 15:11:48 -07:00
Treehugger Robot
fde8373468
[automerger skipped] Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
am: c711d1c39a
am: ab099dfcf6
-s ours
...
am skip reason: Merged-In I2e63431cd0d8cf4712fc278646627fbf34a2b542 with SHA-1 8e6af783ce
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056
Change-Id: I0bd1c02f3f9abe0f0f936de3205fd9b039e7fd61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 21:42:14 +00:00
Peiyong Lin
7aed3cf0af
[automerger skipped] [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
am: a62d014687
-s ours am: f3f3179eeb
-s ours
...
am skip reason: Merged-In Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250 with SHA-1 774378530f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055
Change-Id: If864f4a55b05fa0c6e2fed3770900df67df1c937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 21:42:11 +00:00
Peiyong Lin
763fc4f693
[automerger skipped] [Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
am: 3c924fd848
-s ours am: 4cf368ee84
-s ours
...
am skip reason: Merged-In I4f856ee1912a59052a6aaf7dff087ce1b649935e with SHA-1 39eb3a5ad0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036
Change-Id: I050ba9a00ad8c92934f0da4c117395a74ffd9a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 21:42:06 +00:00
Treehugger Robot
ab099dfcf6
Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
am: c711d1c39a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056
Change-Id: Icca52680a21a4e5c86edacc1bab137dbca34846d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 21:09:15 +00:00
Peiyong Lin
f3f3179eeb
[automerger skipped] [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
am: a62d014687
-s ours
...
am skip reason: Merged-In Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250 with SHA-1 774378530f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055
Change-Id: Ifa7887a16f6239caaf8a72ea694530cf0aa88ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 21:09:12 +00:00
Peiyong Lin
4cf368ee84
[automerger skipped] [Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
am: 3c924fd848
-s ours
...
am skip reason: Merged-In I4f856ee1912a59052a6aaf7dff087ce1b649935e with SHA-1 39eb3a5ad0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036
Change-Id: If7e50679650bd1f862a8b4f7b3bbc60b01daf9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 21:09:06 +00:00
Treehugger Robot
edc1304cc5
Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056
Change-Id: I62d88700fe6c8110dd0e70b39d6ed42a6a88fb8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:26 +00:00
Peiyong Lin
e92284ced1
[Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055
Change-Id: If12eaf605c7e85da20bbcd48ccf3f855e744091d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:23 +00:00
Treehugger Robot
c711d1c39a
Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056
Change-Id: I3db0eb07ffd56aeb80855f13cca6f07caea2f8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:22 +00:00
Peiyong Lin
24503938b9
[Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036
Change-Id: I83052d9a208fe4b2d8e4bcbaea07cfead1f8bec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:19 +00:00
Peiyong Lin
a62d014687
[Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055
Change-Id: Ib6b009eeead559c0299d4f76dd927c5a5fc87d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:19 +00:00
Peiyong Lin
3c924fd848
[Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036
Change-Id: I8a93c58cf80f113277fc269e42c02e52e9d702c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:15 +00:00
Treehugger Robot
0481d6a318
Merge changes from topic "angle-developer-option-toggle1" into main
...
* changes:
[Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
[Cherry-pick] Add debug property to safe guard ANGLE developer option UI.
[Cherry-pick] Add warning on enabling ANGLE.
2023-10-18 19:50:40 +00:00
Arnab Sen
ae0261e220
Unlock non-secure users automatically (2/2)
...
...while moving apps or media content from internal storage to
adopted storage and vice-versa.
Currently, for FBE enabled devices, whenever move is triggered for
either app or media content, there is a prompt for user to enter their
lockscreen credentials in order to unlock storage if the user has one.
But if the user does not have a lockscreen credential set and is not
running,the wizard page is stuck. This leads to a bad user experience.
StorageWizardMigrateConfirm & StorageWizardMoveConfirm uses
ChooseLockSettingsHelper to launch the authentication method set by the
user in order to unlock the storage. But, it does not handle the
use-case where user has no authentication set and not running, causing
return to the wizard activities, thus blocking the flow. This CL solves
the issue by, checking if the user is not secure, attempt unlock the
storage otherwise prompt the user to unlock.
Bug: 305978187
Test: manual
Steps
1. Create multiple users with atleast one user with an authentication
method setup and one without authentication (apart from system user)
2. Install same apps for all users and also add some content to the
media storage.
3. Format an SD Card as adopted.
4. Attempt to move content.
5. Check that the wizard is not stuck and it is prompting the locked
users to authenticate.
6. Reboot
7. After reboot, Go to Settings > All Apps > app_name
> Storage & Cache
8. Tap on "Change" under Storage and Select Adopted storage.
9. Check the same as Step#5
Change-Id: Ib72e9073386457711cc1d2ba745a24cbea91cd8a
2023-10-18 23:26:28 +05:30
Guojing Yuan
3905fd7ac1
Add a test for the NPE case
...
Fix: 305784475
Test: unit test
Change-Id: I28b19da80e83bbbddf8a71399fbf706fcbb81a5c
2023-10-18 17:19:56 +00:00
Yiyi Shen
f2051efcad
Merge "Add more logging." into main
2023-10-18 14:46:42 +00:00
Chaohui Wang
c7d970a2f6
Add back title in xml
...
So search will work.
Bug: 280864229
Test: manual - try settings search
Change-Id: I1c54ce1b403bc2b06df31d398b3261f2aa6e51fb
2023-10-18 22:21:10 +08:00
Chaohui Wang
dae71fffb4
Dismiss the open dialog if preference is disabled
...
In EnabledNetworkModePreferenceController, to prevent user changing the
value.
Fix: 304952402
Test: manually - open dialog, then received a call
Change-Id: Ia1be0840b061c796f72bf5053870fa9e90bd215f
2023-10-18 19:50:35 +08:00
Sebastian Pickl
1d7e0057f7
Merge "Revert "Adding screenshot tests to settings"" into main
2023-10-18 10:20:42 +00:00
Yiyi Shen
f512283d8d
Add more logging.
...
Bug: 296507968
Test: atest
Change-Id: I7b4372d749713638c7973e9fe8bcf7e14a96e2de
2023-10-18 17:52:04 +08:00
Sebastian Pickl
edbeacce4a
Revert "Adding screenshot tests to settings"
...
This reverts commit cdc3bf0d00
.
Reason for revert: possibly breaking builds b/305851039
Bug: 305851039
Change-Id: I1a67323b3617700707d5b677bb6102b0bf396c4a
2023-10-18 08:48:14 +00:00
Milton Wu
d35b9524b7
Merge "fingerprint pre-enroll calibration" into main
2023-10-18 07:27:36 +00:00
Wilson Wu
9a43aff41d
Merge "Add keyboard vibration settings" into main
2023-10-18 07:18:30 +00:00
MiltonWu
3550029297
fingerprint pre-enroll calibration
...
Add calibration interface and dialog
Test: Manually doing enrollment without any exception
Bug: 301226085
Change-Id: Ibe0d205e87f75bb1d5bd1c646deb8501d96a4a5a
2023-10-18 04:25:14 +00:00
Wilson Wu
e9eb8e65ce
Add keyboard vibration settings
...
Introduce keyboard vibration preference settings
to control keyboard vibration state.
Bug: 289107579
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I9cc5d53f1b22c460ad2acc7e4a412fefbca586df
2023-10-18 02:50:56 +00:00
Joshua Mccloskey
c5f2ce6f25
Merge "Fixed bug w/ ConfirmLock error text flickering" into main
2023-10-18 02:13:01 +00:00
Treehugger Robot
415ee62af8
Merge "Validate ringtone URIs before setting" into main
2023-10-18 02:04:10 +00:00