Treehugger Robot
cf2d79ba25
[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351
-s ours am: 8009906cb6
-s ours am: bd29320e54
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: Ic3ea9786a8e8f068ee19601e9074f8bfd0553d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:42:23 +00:00
Treehugger Robot
8b1a4a7284
[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351
-s ours am: 8009906cb6
-s ours am: bd29320e54
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: I69da7ee3bcd804205cfce3c432bff6fb930ff647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:42:21 +00:00
t
0543ab7266
[automerger skipped] Disable factory reset in DSU mode am: 27619dd45c
-s ours am: c2513dc8d0
-s ours am: c3ae6b4ede
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: I53b0a3b2106e2a53156ee2bbf61a3f1f38ab0627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:42:19 +00:00
t
d84a064bae
[automerger skipped] Disable factory reset in DSU mode am: 27619dd45c
-s ours am: c2513dc8d0
-s ours am: c3ae6b4ede
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: Ib100d8c28c99b79e12404502a3299461c5e1391b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:42:18 +00:00
t
fbebc1cd0e
[automerger skipped] Disable factory reset in DSU mode am: 4296cc1977
am: d1f90f717a
am: fc128d434f
-s ours am: 7d3a9a197f
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: Ia8b44715af2197303ac25966dd6a4283f6134b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:42:10 +00:00
t
24bed1e450
[automerger skipped] Disable factory reset in DSU mode am: 4296cc1977
am: d1f90f717a
am: fc128d434f
-s ours am: 7d3a9a197f
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: If79e54816d2449ec36678c15fe1ed077e17df30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:42:07 +00:00
Treehugger Robot
772238abd6
[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066436
Change-Id: I217c17af94f653ecc729fde5eb563fc027ebfc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:27:22 +00:00
t
d8cb5e9765
[automerger skipped] Disable factory reset in DSU mode am: a2741a76cb
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066436
Change-Id: I3284530cc6adc3fc1d5efcf4590579715021b938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:27:16 +00:00
Treehugger Robot
bd29320e54
[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351
-s ours am: 8009906cb6
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: I13e0585463f359d309e5b08791d84376c941fd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:26:44 +00:00
t
c3ae6b4ede
[automerger skipped] Disable factory reset in DSU mode am: 27619dd45c
-s ours am: c2513dc8d0
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: I421a4dd6ef11d39b8e8370e2f2a3cb982ae82477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:26:39 +00:00
t
7d3a9a197f
[automerger skipped] Disable factory reset in DSU mode am: 4296cc1977
am: d1f90f717a
am: fc128d434f
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: Id6c20b26794b08de160a19f30c06b77987e7672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:26:25 +00:00
Treehugger Robot
cf9bccdc2a
Merge "[Catalyst] Migrate Brightness level" into main
2024-10-31 16:11:26 +00:00
Treehugger Robot
87a47bad19
Merge "Disable factory reset in DSU mode" into sc-v2-dev
2024-10-31 16:08:11 +00:00
Treehugger Robot
8009906cb6
[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: Idcc24125f545e6d99c7485371203fb8953db3566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:07:44 +00:00
t
c2513dc8d0
[automerger skipped] Disable factory reset in DSU mode am: 27619dd45c
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: I6696719e4052fc9446ceb4648986038750483961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:07:38 +00:00
t
fc128d434f
Disable factory reset in DSU mode am: 4296cc1977
am: d1f90f717a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: If07b596780bae7445dc86e32e94f8f0a65bd0e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 16:06:59 +00:00
Treehugger Robot
1b72d667f0
Merge "[Catalyst] Tethering screen migration" into main
2024-10-31 16:00:32 +00:00
Treehugger Robot
93b2db6351
Merge "Disable factory reset in DSU mode" into sc-qpr1-dev
2024-10-31 15:59:47 +00:00
Treehugger Robot
b0e3c959ec
Merge "[Catalyst] Create airplane mode preference" into main
2024-10-31 15:50:01 +00:00
Treehugger Robot
44d6809ab7
Merge changes Ibf8f546c,I172f336a into main
...
* changes:
[Catalyst] Ring volume migration (1/n)
[Catalyst] Media volume migration
2024-10-31 15:47:02 +00:00
t
d1f90f717a
Disable factory reset in DSU mode am: 4296cc1977
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: I3030c76274a9a9f48b784d23a5af5fc73deef870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 15:46:28 +00:00
Sunny Shao
77aa48fe0b
[Catalyst] Migrate Brightness level
...
Test: atest DisplayScreenTest
Bug: 375895862
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: Ia098e107e0e9f011db6742cc8d0ebecfc179cca6
2024-10-31 20:09:52 +08:00
Mill Chen
7c9379e5d2
[Catalyst] Ring volume migration (1/n)
...
Bug: 373978964
Test: atest SeparateRingVolumePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: Ibf8f546c84ffb5467f62a250de37d96b5c974e15
2024-10-31 10:22:56 +00:00
Jason Chiu
8292fbb3ea
Merge "Export Battery usage screen" into main
2024-10-31 08:51:32 +00:00
Haijie Hong
6852925676
Allow launch activity from background for PendingIntent
...
BUG: 343317785
Test: local test
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I22c430c0d3879f034f3a491471781aa9b49a02f2
2024-10-31 16:21:21 +08:00
SongFerng Wang
6520ce9b28
Merge "Hide the mobile data enable dialog during factory reset" into main
2024-10-31 07:58:52 +00:00
Jacky Wang
175b193561
Merge "[Catalyst] Provide launch intent" into main
2024-10-31 07:07:59 +00:00
Mill Chen
75b443375f
[Catalyst] Media volume migration
...
Bug: 364898461
Test: atest MediaVolumePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: I172f336a7d1c843d071dd920d29aa35b4a1a8aaf
2024-10-31 02:43:34 +00:00
Jacky Wang
f035eefe67
[Catalyst] Implement datastore for Smooth display
...
NO_IFTTT=Catalyst only
Bug: 374936314
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: manual & adb shell settings get/put/delete system peak_refresh_rate
Change-Id: Idc9379935934c32ef040be6c4c838e5fbb65319d
2024-10-31 09:54:20 +08:00
Jason Chiu
792d8a97dd
[Catalyst] Tethering screen migration
...
- Add a flag for the migration
- Add the skeleton of the screen
Test: atest TetherScreenTest
Bug: 368359963
Flag: com.android.settings.flags.catalyst_tether_settings
Change-Id: Ib9987def4f1a644f7661e75c314b3a556e8f210c
2024-10-31 09:25:23 +08:00
Bill Yi
2b87ee1de7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id4fbb7f38b5b2f0cee5e68c023347594e5155969
2024-10-30 18:12:48 -07:00
Bill Yi
c5cfcf96e9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If6b9c2d537380e342190f14891b56357a9c1e2f5
2024-10-30 18:10:50 -07:00
Bill Yi
8673b0e5ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iffb8bb4021740d5700a4f905f6ec306d70ce95e1
2024-10-30 18:09:12 -07:00
Treehugger Robot
01359592a2
Merge "Clean up android.webkit.update_service_v2." into main
2024-10-30 21:21:33 +00:00
Austin Delgado
4c0df13f28
Merge "Force Private Space to always use biometric prompt" into main
2024-10-30 21:03:08 +00:00
Treehugger Robot
e616136902
Merge "[Screen off unlock UDFPS] Fingerprint Settings integration 2/2" into main
2024-10-30 20:45:14 +00:00
Austin Delgado
7c235e3c0c
Force Private Space to always use biometric prompt
...
Bug: 365094949
Bug: 365932447
Bug: 366441553
Test: Verified manually
Flag: android.hardware.biometrics.private_space_bp
Change-Id: I78cb53e6e38c73d7819f7368546f53bc7026f9b5
2024-10-30 19:58:36 +00:00
David Liu
307cb08760
Migrate About phone
...
Add the skeleton of About phone
Bug: 373001670
Test: atest MyDeviceInfoScreenTest
Flag: com.android.settings.flags.catalyst_my_device_info_pref_screen
Change-Id: I7799fa5fb82f9dd96959f1419108d15e7e4f7bb9
2024-10-30 18:22:12 +00:00
songferngwang
685074260d
Hide the mobile data enable dialog during factory reset
...
Bug: 365582830
Test: manual testing
Flag: EXEMPT bugfix
Change-Id: I632c3cbaa994f77dc7d0bc1a4a5ef448230165f2
2024-10-30 18:19:17 +00:00
Treehugger Robot
2fdca61ce4
Merge "Change SUW theme style for Fingerprint and Face enrollment flow (1/n)" into main
2024-10-30 14:56:21 +00:00
Joshua Mccloskey
01a374e499
Merge "Removed flag from environment" into main
2024-10-30 13:39:00 +00:00
Jacky Wang
9332b06675
[Catalyst] Provide launch intent
...
Bug: 373895400
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: If7825798c441dc0009fbd91918d4795873b39fa3
2024-10-30 20:24:18 +08:00
Jason Chiu
82a44bf593
Export Battery usage screen
...
Fix: 375298764
Test: manual
Flag: EXEMPT only export activity
Change-Id: I8c6a7926ccdf0faebf18626501bfff7073dab319
2024-10-30 19:31:55 +08:00
Treehugger Robot
5cdcc9be3e
Merge "Migrate Smooth display" into main
2024-10-30 10:57:51 +00:00
Yiyi Shen
fe59b3da1a
Merge "[Audiosharing] Cancel notification when BT BLE both off" into main
2024-10-30 10:39:09 +00:00
Chelsea Hao
01cc104074
Merge "Show error message when inputting invalid audio sharing password." into main
2024-10-30 09:24:35 +00:00
Jason Chang
005aafde24
Change SUW theme style for Fingerprint and Face enrollment flow (1/n)
...
Apply SUW theme style for Fingerprint and Face enrollment flow
Flag: EXEMPT Using setup library's flag
Bug: 346562327
Test: manually build and perform a visual inspection.
Change-Id: I7cbcc04290ba1ddee1328afe3e4efbe1f36aff1c
2024-10-30 08:57:16 +00:00
Sunny Shao
48a1edb12e
Migrate Smooth display
...
Test: manual test
Bug: 374936314
Bug: 368359268
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: Iaacf72751806ca64018145531dd33d510dca7f6a
2024-10-30 16:29:59 +08:00
shaoweishen
dba15f821f
[PhysicalKeyboard] Update Setting Feature Provider for follow up usage
...
rename method in provider and usage, the provider is not activated now,
this change will not have impact on current feature.
Bug: 369937888
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/
Flag: NONE, rename method, no effect on current feature.
Change-Id: I1bb66b106c338a8a8730bbd9163d6a921c17b9c0
2024-10-30 08:22:10 +00:00
Haijie Hong
77132f0e61
Merge "Remove extra space around profiles and audio category" into main
2024-10-30 08:13:38 +00:00