Treehugger Robot
f1cbe74e08
Merge "Only allow clearing of Euicc Data by owner or demo user" into main
2023-10-20 08:33:27 +00:00
Edward Savage-Jones
922fc6067d
Only allow clearing of Euicc Data by owner or demo user
...
Secondary users should not be able to erase downloaded SIMs
is a similar way that they are not be able to factory reset
the device.
Bug: 303488763
Test: On a device with FEATURE_TELEPHONY_EUICC enabled,
create secondary user, enter Settings->System->Reset Options
there should be no option to 'Erase downloaded SIMs'
Change-Id: I4f5326732822bc322ab13a00937f94232ca69228
2023-10-20 08:20:01 +02:00
Chaohui Wang
82a9a9e47d
Remove Settings preference_widget_primary_switch
...
File content same as SettingsLib's preference_widget_primary_switch
Bug: 285231003
Test: m Settings
Change-Id: I4b9f92435ffb5c253241e294c4680025fe0447fc
2023-10-20 12:55:22 +08:00
Yiyi Shen
9031f9f876
Merge "Add flag for LE audio sharing." into main
2023-10-20 04:51:53 +00:00
Bill Yi
a3d94436f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ec22338d6f5075474efab698c2ea00842f27d55
2023-10-19 21:00:32 -07:00
Bill Yi
3a68375726
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6bab970254797b28bd664164fba9a2b59cace5bd
2023-10-19 20:59:36 -07:00
Bill Yi
5f6854e60a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92832957a08b645d66f61156fd0c7ca2ab1c2a71
2023-10-19 20:57:34 -07:00
Bill Yi
423b0f6ae5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b1bc80aec4bda83ac2da1e4fa2ca0c46e0ed9ee
2023-10-19 20:55:45 -07:00
Bill Yi
90e6830bf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0d73f09aaeb0375622c735dfef5ef7679ca31fbc
2023-10-19 20:53:29 -07:00
Bill Yi
fb88ae863a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iecea458fca74e09adb83c70a59aac8a6ce4aa45f
2023-10-19 20:51:59 -07:00
Fan Wu
a2cd54edaf
Merge "Ignore flaky test case to unblock presubmit" into udc-qpr-dev-plus-aosp am: a00e9399d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25114403
Change-Id: Idefe5b3c724c12f20550a6b9eebb7439967daedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 02:02:26 +00:00
Bill Lin
ccdee28340
Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132aff
am: 624ebae395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24942007
Change-Id: I0ceb3a5aec8537fa31c821bdee3a78a89d118071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 01:51:02 +00:00
Eric Biggers
bb366b4ef3
Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb
am: 48e63162ef
am: 099ec4b930
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955
Change-Id: I5bc03a03ac0f58208b384332bde10f8cb15792ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 01:29:58 +00:00
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
Treehugger Robot
5fd0337549
[automerger skipped] Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318
am: edc1304cc5
-s ours am: d2b684f678
-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: I68298ccf997c8904e874e4c2b26e430f0ce43814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 00:11:14 +00:00
Peiyong Lin
00997813b0
[automerger skipped] [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298
am: e92284ced1
-s ours am: 574928e691
-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: I48eda37e1c530025aae5daf5c0bce05737be120b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 00:11:09 +00:00
Peiyong Lin
c7ec042002
[automerger skipped] [Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
am: 24503938b9
-s ours am: 320e827a5e
-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: I38a1bc20bf1742bce1f8753e075f1585b53c13eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 00:10:58 +00:00
fayey
52cec79f1b
Add setting flag for enabling voice activation apps in Special app
...
access.
Bug: 303727896
Test: presubmit
Change-Id: Ic01d6bb47db6150808483e8a4f42389e71885d62
2023-10-20 00:06:22 +00:00
Xin Li
85d1405bc9
[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 7b262e34b7
-s ours am: d122c78e33
-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: I803e7940ff6d9c14e1232638b25db63a87868262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 23:57:30 +00:00
Xin Li
8782334946
[automerger skipped] Merge 10952656 am: 596efc7e94
-s ours am: 0c4f756bca
-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: Ie6892e72e5ebaf09b1630698906409e826976234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-19 23:54:29 +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
Daniel Norman
ba4074b369
Adds OWNERS for Settings aconfig flags, first for Accessibility.
...
This is similar to frameworks/base/packages/SystemUI/aconfig/OWNERS
and allows subteams to add their own namespace's aconfig flags
without needing to bother the core Settings team for review.
Test: n/a
Change-Id: I562f544e744cf2ae3ce75162c9de92dd89bfadc4
2023-10-19 22:54:14 +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
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