Mark Kim
35629bd16b
Merge "Tests that archived apps are returned for AllAppListPage when "android.content.pm.archiving" flag is enabled" into main
2023-10-23 11:46:01 +00:00
Chaohui Wang
15ca95a31b
Migrate to TwoStatePreference
...
SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.
Using TwoStatePreference in Java will helps migration in the future.
Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
2023-10-23 09:28:57 +00:00
Yiyi Shen
a7d0d00f4a
Fix crash when showing the device not found dialog.
...
If users click to pair a not foundable device and then close the Settings page,
Settings will crash becasue dialog holder is closed.
This CL is part of the fix. It set the context to null when the activity
stops.
Bug: 306548036
Test: atest
Change-Id: If68e3e9cd62216ad83b2e5058f504fce35e36a06
2023-10-23 17:26:17 +08:00
Cassie Wang
7976f1e76d
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: ccdd06e496
am: f582544551
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Iaedb4a2933ce24fbd8bd4aabb03da908beab5131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 07:02:30 +00:00
Cassie Wang
3b7f437db8
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: 16e99c187f
am: 16677a5492
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: I5dee3042db1274b1203b08afa09dfe6798f3c4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 07:01:38 +00:00
Cassie Wang
f582544551
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: ccdd06e496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ib3b89b09bc61d2bc780a6863ce4b202ff56a041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:32:36 +00:00
Cassie Wang
16677a5492
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
am: 16e99c187f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: I25a47d376b7fa31a144cdc74bee6c9a99a6b2525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:31:50 +00:00
Cassie Wang
ccdd06e496
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ie98613fd98bfac9f620dd6755e5a118a3433c171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:15:05 +00:00
Cassie Wang
16e99c187f
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-23 06:13:58 +00:00
Cassie Wang
5abd3420c4
Merge "Add a config to show the Vpn options menu." into main
2023-10-23 05:53:32 +00:00
Chaohui Wang
4358467948
Merge "Remove Settings preference_widget_primary_switch" into main
2023-10-23 04:17:52 +00:00
Daniel Norman
8946e64f28
Adds 'App info' button on accessibility service + activity pages.
...
This launches the existing app info page for the a11y feature's owning
package. Features without a valid component (framework features) do not
have this button. This is also not shown in Setup Wizard which does
not support the App Info page.
This helps users find more info about the app that provided an
accessibility feature.
Screenshot: https://screenshot.googleplex.com/B9FXLoomxFjLBv8.png
Flag: accessibility com.android.settings.flags.accessibility_show_app_info_button
Bug: 277378550
Test: atest ToggleFeaturePreferenceFragmentTest (robotest)
Test: Open and interact with the button, ensure it opens the app info
page for the correct app.
Change-Id: I2041c09077ce5fadc72117dc0c72409dd33ef60b
2023-10-20 21:31:11 +00:00
Anthony Zhang
17a04a246f
Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732
am: 8155c507f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290
Change-Id: I7485782ee1b939e12f2c4f87fd1a8405227dd182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 21:21:23 +00:00
Anthony Zhang
8155c507f2
Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290
Change-Id: I5d7c5820749057aeecee9c21eb62f8c6d480ce5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 20:59:55 +00:00
Anthony Zhang
c9606ad732
Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev
2023-10-20 20:40:59 +00:00
Faye Yan
540d810107
Merge "Add setting flag for enabling voice activation apps in Special app access." into main
2023-10-20 18:37:40 +00:00
Julia Reynolds
88f146a3fe
Merge "Allow background start from notif history" into main
2023-10-20 18:10:14 +00:00
Mark Kim
90781a3014
Tests that archived apps are returned for AllAppListPage when "android.content.pm.archiving" flag is enabled
...
Test: AllAppListTest
#AndroidArchiving
Bug: 304255511
Change-Id: Id3523a6290f57e2c74287f960c1adb8f0cc876bc
2023-10-20 17:11:22 +00:00
Julia Reynolds
55f14ae70d
Allow background start from notif history
...
Test: Tap on entries in 'Recently Dismissed'
Fixes: 304651874
Change-Id: Ifcdd881cbd17903b47f93303bf33a72f718dc181
2023-10-20 13:10:27 -04:00
Joshua Mokut
7f25a5edb8
Merge "Added width specs when creating brightness dialog from settings" into main
2023-10-20 15:48:59 +00:00
Yiyi Shen
3df78993d6
Merge "Update the wording for subsequent pair devices in Settings." into main
2023-10-20 12:09:49 +00:00
Treehugger Robot
5ccd4fee6b
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ce0d7e1c61
am: 549ca35ebb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I3b9598f350ef2a18e92611b79e675af99552a239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 10:12:55 +00:00
Treehugger Robot
f7f2f0600b
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ad49e33f01
am: c200d097e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I53046b290eebcfc8647f19e66539dbb84f34afee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 10:12:38 +00:00
Treehugger Robot
549ca35ebb
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ce0d7e1c61
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I8d0bbf66beaaa568e4ee7aaa4bce2409a6a06e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:48:43 +00:00
Treehugger Robot
c200d097e9
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
am: ad49e33f01
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I46d8bdaac17ed33fffedeefbfbfc01e1aa1b145c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:47:35 +00:00
Treehugger Robot
ce0d7e1c61
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: I696de52a418fd1f02291d9ef811d989f5b4e25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:10:21 +00:00
Treehugger Robot
ad49e33f01
Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402
Change-Id: Iaf9eed774382c735bed78f43451b89b61b4e275e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-20 09:08:47 +00:00
Yiyi Shen
8e38bd0b3a
Update the wording for subsequent pair devices in Settings.
...
Change the wording form "Associated with account" to "Previously used
with account"
Bug: 296507968
Test: atest
Change-Id: Ibfb4acabe8713065c517d91bd9d59dbb3956159f
2023-10-20 16:50:43 +08:00
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