Treehugger Robot
062e872b16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 03a0b2b86f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774378
Change-Id: Id8c1e5a47cecfd48cd5e33139fef525fc91dee74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:35 +00:00
Bill Yi
7b3b9448e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f3fc3ff7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774378
Change-Id: Ia6a5d83e2f6c6c40e79f158daa2931787225cb8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:19 +00:00
Treehugger Robot
b4e4b96eb7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 114eeeb6e1
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774376
Change-Id: I227d497231e16f8c7bdb574e11af90b30c87611d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:15 +00:00
Bill Yi
df5002f74a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 63806ab38d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774376
Change-Id: Ifcc963309c9beb77a56fa15480ed3ba45a90f82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:08 +00:00
Bill Yi
b0c6ec9933
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdc1c4f73e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773865
Change-Id: I15f1b7f850e140b89cb3062303f2e90c7bfc0c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:09:55 +00:00
Treehugger Robot
03a0b2b86f
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-08-13 18:51:39 +00:00
Treehugger Robot
114eeeb6e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-08-13 18:51:39 +00:00
Treehugger Robot
cae253dd47
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-13 18:26:07 +00:00
Treehugger Robot
d35ad44cd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 5b58909131
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773863
Change-Id: I7bbc85efd79fa072c7da61b9a3c901739a572869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 18:03:36 +00:00
Bill Yi
a7801c0fa3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 556af55a3a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773863
Change-Id: I58dbb48c237702a58fa3041b8c748708e07e71ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 18:03:18 +00:00
Treehugger Robot
f818b18927
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-13 17:59:59 +00:00
Bill Yi
57c68f531d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 628f7acb6a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773862
Change-Id: Ie133db2789a59f98e451e593aed3675c57b50ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 17:59:14 +00:00
Treehugger Robot
5b58909131
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-08-13 17:39:32 +00:00
Treehugger Robot
d91aed9009
Merge "[dev_option] Dismiss reboot dialog on screen rotation." into main
2024-08-13 17:26:14 +00:00
Vaibhav Devmurari
5cbcfb07fe
Merge "Fix: User main user for personal profile" into main
2024-08-13 11:17:23 +00:00
SongFerng Wang
6f72f45475
Merge "Remove the new task for mobile network page starts the sim onboarding" into main
2024-08-13 09:56:55 +00:00
Xinyi Mao
fd7258ea51
Merge "Update PreferenceCategory style in battery usage." into main
2024-08-13 09:11:28 +00:00
mxyyiyi
f32f31a68e
Update PreferenceCategory style in battery usage.
...
- Remove 2 unexpected padding caused by empty title.
https://screenshot.googleplex.com/8Da8eyezLHnwpkj
https://screenshot.googleplex.com/cs6gRpNkWxDjRER
Bug: 359429437
Test: visual
Flag: EXEMPT bug fix
Change-Id: I055edf8f27a6c646df5c0c8fddfd849282334333
2024-08-13 15:38:55 +08:00
songferngwang
c537bfa8cb
Remove the new task for mobile network page starts the sim onboarding
...
Bug: 349695880
Test: manually test
Flag: EXEMPT bugfix
Change-Id: Id5f35a9311da5e47f0417a45feadb1d1a0a2e35d
2024-08-13 04:41:13 +00:00
Chaohui Wang
544cf32491
Merge "Create ProvisioningRepository" into main
2024-08-13 04:14:42 +00:00
Bill Yi
fdc1c4f73e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I935a89efd29d20a53fe2747204b316cc54d0798f
2024-08-12 20:57:28 -07:00
Bill Yi
b887d04743
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iffadf7cd2e674689401a685747b12f1ed7a4ce40
2024-08-12 20:56:14 -07:00
Bill Yi
e7f3fc3ff7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I304656c879dc3a67fe91738853e463159680bead
2024-08-12 20:52:44 -07:00
Bill Yi
63806ab38d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3485a70b975502e2ebf7672d9a79c6a9e1e7ca09
2024-08-12 20:48:22 -07:00
Bill Yi
e8bfad29b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6566ca37f873f5d6ddb7cea84050bde56a2dab4b
2024-08-12 20:47:10 -07:00
Bill Yi
556af55a3a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I009202727ca65ba38beba375c7d6a976d9dacf18
2024-08-12 20:45:12 -07:00
Bill Yi
628f7acb6a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I679f4a32e2bd0cbf4c2d77a6dac53c9addaa6a01
2024-08-12 20:43:39 -07:00
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
Alina Zaidi
156798b168
[dev_option] Dismiss reboot dialog on screen rotation.
...
Bug: 356273849
Test: mp droid and locally checked that there are no errors and crashes
Flag: EXEMPT minor fix
Change-Id: Id60b304788bfb79fee13858c8e7bc30261f8e1c7
2024-08-12 16:09:03 +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
Vaibhav Devmurari
1c7bed6c11
Fix: User main user for personal profile
...
Bug: 356879517
Test: manual
Flag: EXEMPT bugfix
Change-Id: Ia75ad08f5c2e585ab20478e045c8165dc42c3da8
2024-08-12 12:05:37 +00: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
Chaohui Wang
f245b3e04f
Create ProvisioningRepository
...
Also check if has IMS feature before calling ProvisioningManager.
Bug: 358000881
Flag: EXEMPT refactor
Test: manual - on Mobile Settings
Test: atest ProvisioningRepositoryTest
Change-Id: I5fffff6c63af8c67d666b0e855f026633bb36651
2024-08-12 05:43:57 +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