PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,701 Commits 1 Branch 0 Tags
a00e9399d86b3562d4aad7913a60c90c766fc1c9
Commit Graph

129701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Wu
a00e9399d8 Merge "Ignore flaky test case to unblock presubmit" into udc-qpr-dev-plus-aosp 2023-10-20 01:08:02 +00:00
Bill Lin
624ebae395 Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132aff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24942007

Change-Id: Ic76d9917222bdab7ce268639ac622409fab677c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 00:38:06 +00:00
Bill Lin
2943132aff Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev 2023-10-19 23:37:35 +00:00
Eric Biggers
099ec4b930 Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb am: 48e63162ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955

Change-Id: If8466c80a28c3a5a0fbb22b8b63520906f50f87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 20:47:57 +00:00
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
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
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
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
Peiyong Lin
34d308924e [Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled. 
Previously the ANGLE developer option toggle UI was disabled by default
and a user would need to use adb command to set the debug property to
true to enable it, and every reboot would reset the debug property to
false again and hence disable the toggle UI again. However, since ANGLE
is still in experiment, we would like to make sure it's not easy to
enable but easy to disable. This patch keeps ANGLE toggle UI enabled
when ANGLE is enabled so that users can easily disable. Once ANGLE is
disabled, if the debug property is not set to true, the toggle UI will
remain disabled.

Bug: b/293503000
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I2e63431cd0d8cf4712fc278646627fbf34a2b542
Merged-In: I2e63431cd0d8cf4712fc278646627fbf34a2b542
 2023-10-17 21:07:48 +00:00
Peiyong Lin
3182b0e298 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. 
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
Merged-In: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
 2023-10-17 21:06:05 +00:00
Peiyong Lin
d3c75bd9eb [Cherry-pick] Add warning on enabling ANGLE. 
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.

Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
Merged-In: I4f856ee1912a59052a6aaf7dff087ce1b649935e
 2023-10-17 21:02:47 +00:00
Bill Yi
e001a5ffb2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9f4fc1ddd1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25069815

Change-Id: I1b7c7ddac0fd5886e397dbb5a0a89c886430ec32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 01:05:09 +00:00
Bill Yi
2dd7c0e9a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bb2cfb90a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25069815

Change-Id: I86ce80a484107ff24b70204908ac73b395f05078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 01:04:56 +00:00
Bill Yi
e723134049 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17a43cb6ac -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25069620

Change-Id: Ia0ff50e86e17fb10daacab180566ed72b9ca4675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 01:04:33 +00:00
Bill Yi
9f4fc1ddd1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-10-17 00:38:42 +00:00
Bill Yi
17a43cb6ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f91344dcf2c474aa8f85a775ac675994cc478df
 2023-10-16 14:12:28 -07:00
Bill Yi
1bb2cfb90a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I534002e77bfb5ee035b34f4d49ab603600e6b073
 2023-10-16 14:10:47 -07:00
Treehugger Robot
22b54a82e5 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 am: 99a382a05f am: dcd5c3ea0e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Ic48cfef3f29f8ba4d8512c73334eb006a8ff2c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 04:15:33 +00:00
Treehugger Robot
dcd5c3ea0e Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 am: 99a382a05f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Ifb295e18feee4a67f4088966d0a19dc0a5ba1fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 03:42:06 +00:00
Treehugger Robot
99a382a05f Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: I5f5f1c389edb778a44aad736081ff077dcd402aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 03:08:55 +00:00
Treehugger Robot
72943317d2 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Id9c81a0d31b4a0452d614b68b6850342a94ab3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 02:37:41 +00:00
Treehugger Robot
3eea9e53a1 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main 2023-10-16 01:52:44 +00:00
Graciela Putri
8319a77527 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956690

Change-Id: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 09:45:46 +00:00
Graciela Putri
6e9666ab53 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev 2023-10-12 09:30:41 +00:00
Graciela Putri
94f7219937 Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007832

Change-Id: Iab27c31c7512f4f7e48d8b10d410044c4db39aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 09:28:31 +00:00
Graciela Putri
2147c152ac Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev 2023-10-12 09:07:50 +00:00
Treehugger Robot
8f4a7e7505 [automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492 am: 23c571ff2b -s ours 
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e0119 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Ibf9478072143dfbe6af85271c9c4e5aa5c49626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 02:16:33 +00:00
Treehugger Robot
23c571ff2b Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: I8873863c35e54bc92f5aae982fe159a5e5e46438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 01:43:51 +00:00
Treehugger Robot
409a6b2492 Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id95f85e07c45a722a5229507be58cb582ca3587e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 01:11:05 +00:00
Treehugger Robot
b06310a63f Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 00:38:18 +00:00