Xin Li
d19cd22137
[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: 20fb15ea4b
-s ours
...
am skip reason: Merged-In I2489a64804f068a957f9be3f87847d6911b24447 with SHA-1 2871811694
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28718677
Change-Id: I0aff400d5996efb318fd3c4b29066ba6512f5b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-12 21:03:06 +00:00
Xin Li
e84fc9380c
[automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: e2d326beeb
-s ours
...
am skip reason: Merged-In I2489a64804f068a957f9be3f87847d6911b24447 with SHA-1 2871811694
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28718677
Change-Id: Id64a29f31639a1911758f668d549b252b7e4125f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-12 21:01:24 +00:00
Treehugger Robot
cc9a03437e
Merge "Reduce the size of individual icons in the icon picker" into main
2024-08-12 17:16:50 +00:00
Xin Li
20fb15ea4b
Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future
2024-08-12 17:14:32 +00:00
Adam Bookatz
97caf58b33
Merge "startActivityForResult with new Intent" into main
2024-08-12 16:29:38 +00:00
Matías Hernández
f1cd68ebd3
Reduce the size of individual icons in the icon picker
...
Bug: 359171199
Test: manual
Flag: android.app.modes_ui
Change-Id: Iba5c09948437887f12b946aa39f7c811437f20dc
2024-08-12 18:04:43 +02:00
Matías Hernández
a274bcb400
Modes icon picker: measuring improvements
...
Ensure that horizontal spacing between items in the icon picker is distributed to the left and right of the row instead of between the items. This makes the horizontal and vertical spacing the same.
Bug: 359171199
Test: manual + hsv
Flag: android.app.modes_ui
Change-Id: I68c3860ba4092bb6fde2a1218b3f6a95d0c373da
2024-08-12 15:32:44 +02:00
Haijie Hong
2a01b356ae
Merge "Move rename button next to the device name" into main
2024-08-12 08:18:32 +00:00
tomhsu
b213804b87
Fix crash due to UserManager is null.
...
- Instance of UserManager get from onCraete, so we can not use this
onAttach.
Flag: EXEMPT bug fix
Fix: 289232540
Test: Manual test
Change-Id: Ieb62d8289db0dbcd5a16280aa66f3b3de8936e26
2024-08-12 05:52:16 +00:00
Treehugger Robot
0373a46e81
Merge "Hide new Hotspot preferences if feature is disabled" into main
2024-08-12 04:55:54 +00:00
Haijie Hong
c2ed6d3242
Move rename button next to the device name
...
BUG: 343317785
Test: atest GeneralBluetoothDetailsHeaderControllerTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I87f030ca48d3edac13759fe51499b7e400dbb795
2024-08-12 12:31:45 +08:00
Tom Hsu
a6678ad6f6
Merge "DISALLOW_CONFIG_MOBILE_NETWORKS for Mobile Network" into main
2024-08-12 04:29:41 +00:00
Kai Zhou
c64611f30f
Merge "Add unit test in WifiDppConfiguratorActivity" into main
2024-08-12 02:59:28 +00:00
Tom Hsu
691df93559
Merge "Add a warning dialog to notify user that call may end by operation." into main
2024-08-12 02:42:59 +00:00
Weng Su
675b817c49
Hide new Hotspot preferences if feature is disabled
...
- Hide new "Security" preference
- Hide new "Speed and compatibility" preference
Bug: 356898105
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiTetherSettingsTest
Change-Id: I734959ed511929bfcc9a314770a4acdf9a7e0b99
2024-08-12 05:49:02 +08:00
Jason Hsu
c98fd48306
Merge "Flash Notifications color dialog crashs if configuration changes" into main
2024-08-10 08:03:32 +00:00
Hao Dong
f56a1bccba
Merge "Set component name only for ConfirmDeviceCredentialActivity." into main
2024-08-10 04:44:08 +00:00
jasonwshsu
e08c1a5f92
Flash Notifications color dialog crashs if configuration changes
...
Root Cause:
When configuration changes, it will recreate fragment then call no args constructor which lead to null pointer exception for error passing parameters in getInstance().
Solution:
* Use setArguments() to pass parameters.
* Move settings key update action into fragment.
* Obsever settings key changes to update summary accordingly.
Bug: 349049233
Test: atest ScreenFlashNotificationColorDialogFragmentTest ScreenFlashNotificationPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: Ided0853cf9a989e2f288a85c1aa709f71f7e1cd6
2024-08-10 10:24:30 +08:00
Treehugger Robot
6c3abd0bce
Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843
am: d005b3250b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3214820
Change-Id: I0293acecd11dc3e93b0aa1c047204bee67192bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 23:55:19 +00:00
Treehugger Robot
d005b3250b
Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3214820
Change-Id: I5b364535808594161ae0aa7fe6d2eb75149fdd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 23:31:01 +00:00
Treehugger Robot
05c4027843
Merge "Fix DoubleBraceInitialization errorprone issues" into main
2024-08-09 23:12:10 +00:00
Cole Faust
2483b32069
Fix DoubleBraceInitialization errorprone issues
...
https://errorprone.info/bugpattern/DoubleBraceInitialization
Flag: EXEMPT refactor
Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Idf52035a720f051a43553b53a89a37131d4e208b
2024-08-09 15:05:14 -07:00
Hao Dong
3d357eedb8
Set component name only for ConfirmDeviceCredentialActivity.
...
1. Rename setComponentNameForConfirmDeviceCredentialActivity() to
setRealCallerForConfirmDeviceCredentialActivity()
2. Move the call from BiometricFragment to
ConfirmDeviceCredentialActivity.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
2024-08-09 11:51:03 -07:00
Joshua Mccloskey
dbbcdd6ebe
Merge "Make choose lock screen consistent" into main
2024-08-09 17:16:04 +00:00
YK Hung
3a71993386
Merge "Fix NPE in DynamicDenylistManager" into main
2024-08-09 16:56:03 +00:00
Wesley Wang
77ded32a49
Fix NPE in DynamicDenylistManager
...
Bug: 357280604
Change-Id: Ifcfe5cfea67f3ef692a865ef43db8e22de3cd68d
Test: atest DynamicDenylistManagerTest
Flag: EXEMPT for bug fix
2024-08-09 14:42:15 +00:00
Treehugger Robot
11d21e57d9
Merge "SettingsApp Implement DISALLOW_GRANT_ADMIN in user creation flow" into main
2024-08-09 10:24:17 +00:00
Weng Su
a65576cb0b
Merge "Fix WifiQrCode scheme inconsistency issue" into main
2024-08-09 08:25:25 +00:00
Chaohui Wang
fa28c7a636
Merge "Reduce flaky of AppNotificationPreferenceTest" into main am: 422770ed1e
am: 6d09b136d5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3212002
Change-Id: I7255b69e79f7a970c2488d4bcf700c43f13ce40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 07:11:25 +00:00
Chaohui Wang
6d09b136d5
Merge "Reduce flaky of AppNotificationPreferenceTest" into main am: 422770ed1e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3212002
Change-Id: If04a3e903a7fd151dd07004eba283f41df044ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 06:55:52 +00:00
Chaohui Wang
422770ed1e
Merge "Reduce flaky of AppNotificationPreferenceTest" into main
2024-08-09 06:43:05 +00:00
Chaohui Wang
7380359520
Reduce flaky of AppNotificationPreferenceTest
...
Bug: 355413226
Flag: EXEMPT test only
Test: atest AppNotificationPreferenceTest
Change-Id: I1dfe4c5ae764941acb78e8fad52518963d1dad74
2024-08-09 05:33:27 +00:00
Weng Su
7b0e5560d1
Fix WifiQrCode scheme inconsistency issue
...
- New WifiQrCode design has been moved to WiFi Framework module
- URI scheme changed from string "DPP" to integer 2
Bug: 356971926
Flag: EXEMPT bugfix
Test: manual test by 15-dpp-fail.apk
Change-Id: I00834ccb32f3ced8345213eef55b5aaa77006f7a
2024-08-09 04:36:16 +00:00
Jason Hsu
a60f80f4de
Merge "Connected devices page did not show correct summary when member device connect" into main
2024-08-09 03:21:18 +00:00
Chaohui Wang
e880a15aeb
Merge changes from topic "PreferredNetworkModeSearchItem" into main
...
* changes:
Dual SIM search for Preferred network type
Refactor MobileNetworkSettingsSearchIndex
2024-08-09 02:50:04 +00:00
Yiyi Shen
0526b75450
Merge "[Audiosharing] Fix stop sharing btn in notification" into main
2024-08-09 02:38:03 +00:00
Yiyi Shen
4ac216914e
Merge "[Audiosharing] Update dialog btn when start sharing with no extra connected device" into main
2024-08-09 02:37:20 +00:00
Edgar Wang
c7ab30ada8
Merge "Fix NPE in date time settings" into main
2024-08-09 02:07:51 +00:00
jasonwshsu
15c6533ef9
Connected devices page did not show correct summary when member device connect
...
Root Cause: CsipDeviceManager only refreshes UI when switching member device content.
Solution:
* CsipDeviceManager needs to call refresh() on main device when it's new
member device added.
* UI widget Settings/BluetoothDevice also need to monitor it's member device status to refresh UI.
Bug: 344947362
Test: atest BluetoothDevicePreferenceTest
Flag: EXEMPT bugfix
Change-Id: I58f9e2fc209d4e87631784d0538b1647228f4c1a
2024-08-09 09:49:35 +08:00
Joshua Mccloskey
1a888b6e8f
Merge "Added haptic feedback in fingerprint settings auth" into main
2024-08-09 00:43:42 +00:00
Xin Li
e2d326beeb
Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
...
Bug: 347831320
Merged-In: I2489a64804f068a957f9be3f87847d6911b24447
Change-Id: I1885ef34f69ac4eb6e76ac903fcacdebe4139ae1
2024-08-08 11:41:20 -07:00
Diya Bera
9148e612fe
Merge "Update mandatory biometrics string" into main
2024-08-08 18:26:24 +00:00
Riley Jones
386dda7028
Merge "Adjust edit shortcuts page to display button & gesture" into main
2024-08-08 17:24:46 +00:00
Diya Bera
58e3822485
Merge "Do not call credential if authenticators does not allow" into main
2024-08-08 16:37:50 +00:00
Diya Bera
2d382d5e36
Update mandatory biometrics string
...
String has been changed from "This is needed since Identity Check is on"
to "Identity Check is on"
Flag: android.hardware.biometrics.flags.mandatory_biometrics
Fixes: 358175977
Test: Manual
Change-Id: I12976f8eb52f419e5a97c88c35a1264e843ec259
2024-08-08 16:25:11 +00:00
Treehugger Robot
93b093033a
Merge "Migrate Tips Card in battery uasge to Settings Card." into main
2024-08-08 15:09:30 +00:00
mxyyiyi
427c9c3187
Migrate Tips Card in battery uasge to Settings Card.
...
before:
[Dark-settings]:https://screenshot.googleplex.com/56EiS3PbtRsh5RR
[Light-app]:https://screenshot.googleplex.com/8UDuFEkkrLUt53D
after:
[Dark-settings]:https://screenshot.googleplex.com/3zKxxGi2Awa6s72
[Light-settings]:https://screenshot.googleplex.com/rsgVh9P62x7itUa
[Dark-app]:https://screenshot.googleplex.com/56EiS3PbtRsh5RR
[Light-app]:https://screenshot.googleplex.com/6bfs2u43nZpHL8y
Bug: 357603119
Test: atest BatteryTipsControllerTest
Flag: EXEMPT bug fix
Change-Id: I25e3b407378b01ef9868326a005554ceb6e94181
2024-08-08 13:59:11 +00:00
tomhsu
5df87faad5
Add a warning dialog to notify user that call may end by operation.
...
Flag: EXEMPT bugfix
Fix: 299061626
Test: atest passed
Test: Manual test passed
Change-Id: I09e0186da45b0ccd00ccf0d86d6448a13b363298
2024-08-08 13:09:24 +00:00
Alexander Roederer
22677304c9
Merge "Remove the ZenModeSliceBuilder" into main
2024-08-08 11:35:11 +00:00
Yiyi Shen
a26baa0096
[Audiosharing] Fix stop sharing btn in notification
...
When the broadcast is off but the notification mis-stay, click on "Stop
sharing" should dismiss the notification.
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 305620450
Change-Id: Ic5b30f29b8acc06244c38eb357f63ed83985d74a
2024-08-08 18:01:07 +08:00