Chelsea Hao
d51a1dc4ca
Merge "[Audiosharing] Set visibility by active device." into main
2023-12-14 03:27:35 +00:00
Milton Wu
031cfcf93a
Merge "Refine calibrator usage" into main
2023-12-14 03:00:23 +00:00
josephpv
d2d3453f81
Update USER_SETUP_COMPLETE setting after starting private space
...
On setting USER_SETUP_COMPLETE for private profile device is reapplied
to the profile
Bug: 311348071
Test: Verified device theme color is applied to profile
Change-Id: I25f3013aaf6cfc6925d858b461c1f2c6beb534f6
2023-12-13 14:31:47 +00:00
chelseahao
7edc93ec25
[Audiosharing] Set visibility by active device.
...
Also created header and button controller for detail page.
Bug: 305620450
Test: manual
Change-Id: I5e468a0fb9ce49ef0fd9a0b00b51084cfd416ce0
2023-12-13 19:10:12 +08:00
Jan Tomljanovic
303abbc3cc
Merge "Always confirm eSim removal." into main
2023-12-13 10:54:43 +00:00
MiltonWu
2feaa3fa25
Refine calibrator usage
...
Bug: 316103317
Test: Manually run the scenario
Change-Id: If57396696b6a7d10e289ab0f2e7b14148034d34b
2023-12-13 10:16:47 +00:00
Yiyi Shen
b107bfc9ac
[Audiosharing] Fix volume control error display.
...
Avoid showing the volume control when the device is not acting as the
sharing source.
Bug: 305620450
Test: manual
Change-Id: I162681d5d0cd84d19c351dce8cfdf833734bbb1b
2023-12-13 17:31:49 +08:00
SongFerng Wang
928942c80f
Merge "Add the flag to control the dual sim onboarding feature" into main
2023-12-13 08:16:29 +00:00
Yiyi Shen
a65cbf259c
Merge "[Audiosharing] Refine text style." into main
2023-12-13 07:46:30 +00:00
SongFerng Wang
3d3159656c
Add the flag to control the dual sim onboarding feature
...
Bug: 298898436
Bug: 298891941
Change-Id: I8ba94b6aab4056ce314d2d267cd79a5a6c1490e8
Test: Build pass
2023-12-13 07:15:47 +00:00
Jakob Schneider
accd9ca298
Merge "Fix settings tests where we relied on the resId." into main
2023-12-12 19:41:53 +00:00
Mark Kim
f1dd128c45
Make stable enableability of AppPermissionPreference, HibernationSwitchPreference buttons when app is archived
...
Test: n/a
Bug: 315770669
Change-Id: I0b4a1f8a2d3bbe9c6e8b59b5b1e16c606d26e8ed
2023-12-12 18:10:12 +00:00
Jakob Schneider
75b99cc6e4
Fix settings tests where we relied on the resId.
...
Test: HibernationSwitchPreferenceTest
Bug: 315957412
Change-Id: I1e941563c480de6c8cb15bc4c8b0876e2aa44824
2023-12-12 18:04:17 +00:00
Jan Tomljanovic
db1402a4df
Always confirm eSim removal.
...
Test: atest DeleteSimProfilePreferenceControllerTest
Bug: 313604661
Change-Id: I0c43790bf43bedcc2e8075aa7be0b25876c731b4
2023-12-12 15:57:19 +00:00
Jigar Thakkar
11df0d4c17
Merge "Enable biometric support to unlock profiles" into main
2023-12-12 14:50:27 +00:00
Mark Kim
deca917b44
Merge "Reload buttons on App Info page after app archiving." into main
2023-12-12 14:38:50 +00:00
Hani Kazmi
7580dac41b
Merge "Update existing ECM settings to use new infrastructure" into main
2023-12-12 12:01:17 +00:00
Mark Kim
4345908c39
Merge "Add 'Restore' button to AppInfo screen" into main
2023-12-12 10:42:10 +00:00
Jakob Schneider
2368e260fe
Merge "Change the strings on the opt-out toggle to also account for archiving." into main
2023-12-12 10:28:53 +00:00
YK Hung
cf48086210
Merge "Add screen timeout destination to settings" into main
2023-12-12 10:11:43 +00:00
YK Hung
249434d02b
Merge "Add record for anomaly detect request source and clean up unused function." into main
2023-12-12 10:10:57 +00:00
Manish Singh
b31b54d5c3
Merge "Select the correct tab" into main
2023-12-12 10:04:19 +00:00
Chelsea Hao
65b8b5997f
Merge "[Audiosharing] Impl pwd dialog and detail page" into main
2023-12-12 08:38:01 +00:00
mxyyiyi
ed7ce44f65
Add record for anomaly detect request source and clean up unused function.
...
Bug: 315905559
Test: make RunSettingsGoogleRoboTests ROBOTEST_FILTER="com.google.android.settings.fuelgauge.*"
Change-Id: I21a13a7910b21b27aac58143bd41c77e87c71953
2023-12-12 15:56:54 +08:00
David Liu
e642b4cf2d
Merge "fixed NPE while initializing controllers by commenting out the failure one for temporal fix" into main
2023-12-12 07:07:53 +00:00
Wesley Wang
336c441db5
Add screen timeout destination to settings
...
When an intent with action android.settings.SCREEN_TIMEOUT_SETTINGS is
launched, ScreenTimeoutSettings should be shown in settings
Bug: 293813663
Test: manual and local build verify
Change-Id: I1340cd3c233aa5d36f45b53b0fd2b6924f3a1d75
2023-12-12 14:55:15 +08:00
Yiyi Shen
9687251040
[Audiosharing] Refine text style.
...
Bug: 305620450
Test: manual
Change-Id: I0b67ff1896556951451b5676b1b5d4ae39963524
2023-12-12 14:40:26 +08:00
Hyunho Shin
a2555df74c
Merge "Add the condition to show the eSIM convert menu." into main
2023-12-12 06:33:33 +00:00
chelseahao
1bb099f872
[Audiosharing] Impl pwd dialog and detail page
...
Bug: 305620450
Test: manual
Change-Id: I2686aee4c3809c5f683a42b6440a5fd361e7be0b
2023-12-12 14:14:03 +08:00
Yiyi Shen
a51097d008
Merge "[Audiosharing] Add prefix to device list item text in adapter." into main
2023-12-12 05:36:54 +00:00
Yiyi Shen
f3e693d7a5
Merge "[Audiosharing] Fix test." into main
2023-12-12 05:35:44 +00:00
Chaohui Wang
e96900d1ae
Merge "Fix the isEmbeddedSubscriptionVisible logic" into main
2023-12-12 05:21:01 +00:00
Chaohui Wang
7a33bd5982
Merge "Fix cold startup of NetworkProviderCallsSmsController" into main
2023-12-12 05:20:51 +00:00
Hyunho
036ed3fcee
Add the condition to show the eSIM convert menu.
...
When pSIM converts to eSIM, the new eSIM is downloaded and pSIM is disabled.
However, if the pSIM is in the preferred SIM, a pop-up occurs that says the downloaded eSIM is preferred.
This may cause confusion for users regarding seamless pSIM conversion.
Therefore, change the condition to show the convert menu if there is a pSIM, pSIM conversion is supported, and there is no active eSIM.
Bug: b/314881248
Test: manual done
Change-Id: I10134057a9ae7845ab9fb8b9b8b9f85629d33fa0
2023-12-12 04:56:19 +00:00
SongFerng Wang
e4d761254e
Fix the isEmbeddedSubscriptionVisible logic
...
Bug: 314736037
Change-Id: I10ddafbad1590a660735466c0f6d7e9ed8bffcff
Test: local test
2023-12-12 04:26:43 +00:00
Yiyi Shen
bdb66db5f3
[Audiosharing] Fix test.
...
https://android-build.corp.google.com/test_investigate/?invocationId=I15800010225964211&testResultId=TR05829086064241708
Test: make RunSettingsRoboTests2 -j40
Bug: 305620450
Change-Id: Ia93cd0dc0c9959d8ab078b29023936b21c7a0e08
2023-12-12 11:44:58 +08:00
Fan Wu
dd61b6bb3d
Merge "Fix BluetoothUpdateWorkerTest." into main
2023-12-12 01:16:22 +00:00
David Liu
13c63260a3
fixed NPE while initializing controllers by commenting out the failure
...
one for temporal fix
Added @Nullable in parameters of buildPreferenceControllers() to prevent using nullable parameter to functions requires non-nullable.
Bug: 315330037
Test: see developer options preferences show/hide based on the
controllers isAvailable()
Change-Id: If42faea900a2220d9b1f5e38e1befbd5a555e78a
2023-12-12 00:16:32 +00:00
Ruslan Kim
4df98df7f7
Merge "Revert "Adding screenshot tests to postsubmit."" into main
2023-12-11 23:54:36 +00:00
Jigar Thakkar
66fb046c70
Enable biometric support to unlock profiles
...
This change ensures the ConfirmCredentialActivity allows biometric
authentication to unlock (or disable quiet mode for) a profile if
the profile storage is unlocked when in quiet mode.
Test: atest SettingsRoboTest
Bug: 312184187
Change-Id: Iefcebf2f93403591a1a4c50ff5da8d6055a37b03
2023-12-11 23:50:10 +00:00
Ruslan Kim
498d88671a
Revert "Adding screenshot tests to postsubmit."
...
This reverts commit ade491b466
.
Reason for revert: Missing test_suite b/315860052
Change-Id: Ie64aa53f6d327f4710db491415263c586e52a8c4
2023-12-11 23:31:44 +00:00
Xin Li
58696a3345
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc
-s ours am: 5cd5689267
-s ours am: c118ba99fa
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I2af6e22165f8aff1b2ee178d59e891cd1558d24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 23:00:26 +00:00
Xin Li
967bdd4310
[automerger skipped] Merge Android 14 QPR1 am: 784b56d43f
-s ours am: 7d2f4be0ba
-s ours am: 36a2f3cc93
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I4bae7926a47aa80d04c89cdbe7f7d4d9737b8881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:57:30 +00:00
Mark Kim
e3b456ef3e
Add 'Restore' button to AppInfo screen
...
Test: AppButtonsTest, AppRestoreButtonTest
Bug: 304255818
Change-Id: Ica9055d8ee5603e4bb682e9b5d90a225c839002a
2023-12-11 22:07:03 +00:00
Treehugger Robot
bd0eb0dd31
Merge "Lock Private space at the end of PS setup." into main
2023-12-11 22:05:12 +00:00
Xin Li
c118ba99fa
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc
-s ours am: 5cd5689267
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I41ee10d0c4c60f9777907275260404156def2d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:05:10 +00:00
Xin Li
36a2f3cc93
[automerger skipped] Merge Android 14 QPR1 am: 784b56d43f
-s ours am: 7d2f4be0ba
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I07ee696955ad4f1b7f5952539da6f6c299328429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:02:17 +00:00
Joshua Mccloskey
d1f24c845c
Merge "Adding screenshot tests to postsubmit." into main
2023-12-11 21:43:07 +00:00
Xin Li
5cd5689267
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I0295ace8868448969c6e97d817ac85a042f3452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:19:27 +00:00
Xin Li
7d2f4be0ba
[automerger skipped] Merge Android 14 QPR1 am: 784b56d43f
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: Ie0309426ebc4ba2c6db303e08d87c4b940802db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:16:28 +00:00