Howard Chen
3f7f1a7c45
Merge "Disable factory reset in DSU mode" into udc-dev
2024-10-24 06:24:31 +00:00
Howard Chen
5631756a07
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
am: db47f7bfe8
-s ours am: f39aa3eae6
-s ours am: 89ee71f997
-s ours am: df5562757a
-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/+/29110306
Change-Id: Id38313b4dfa1757e95b56f26c57d15be1d31cd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 04:33:56 +00:00
Howard Chen
57d02eeaa8
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
am: 00143bf156
am: 22d4e17415
am: 6122b1a9cf
-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/+/29110306
Change-Id: I293d446192d9789f1839c860f1ea13f148b19ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 04:33:43 +00:00
Howard Chen
df5562757a
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
am: db47f7bfe8
-s ours am: f39aa3eae6
-s ours am: 89ee71f997
-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/+/29110306
Change-Id: Iee6e57cab52f86d245ddcefb3a3d266802934a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 04:02:29 +00:00
Howard Chen
8ce61174fd
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
am: db47f7bfe8
-s ours am: f39aa3eae6
-s ours am: 040fa213f9
-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/+/29110306
Change-Id: I0675eae5e6668a78a82e1f460ba7ef63cf214c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 04:02:29 +00:00
Howard Chen
6122b1a9cf
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
am: 00143bf156
am: 22d4e17415
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I024a7a93e1fac530d85441e2253a937059c649f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 04:02:20 +00:00
Howard Chen
d8f7975a8a
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
am: 00143bf156
am: ccb34dc532
-s ours
...
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 784e52c9be
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: Ic81b627c3a8b46c69343bc9181fef00d314ada84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 04:02:16 +00:00
Treehugger Robot
010fbe033c
Merge "Add WifiCallingScreen and corresponding TS flag" into main
2024-10-24 04:00:14 +00:00
Howard Chen
89ee71f997
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
am: db47f7bfe8
-s ours am: f39aa3eae6
-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/+/29110306
Change-Id: I06ad32bd19235257e92f813740cba674df00d25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:56:22 +00:00
Howard Chen
040fa213f9
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
am: db47f7bfe8
-s ours am: f39aa3eae6
-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/+/29110306
Change-Id: Icded16ce9d1b1dab8b45c70677107b0111ac2968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:51:26 +00:00
Howard Chen
ccb34dc532
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
am: 00143bf156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I08f3ec0c81a3ca01de6ce2513e81a284d8cff062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:51:16 +00:00
Howard Chen
f39aa3eae6
[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
am: db47f7bfe8
-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/+/29110306
Change-Id: I9fc84657515c2929eb125470275147eb825c8902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:51:11 +00:00
Howard Chen
22d4e17415
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
am: 00143bf156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: Iac3a36596ad2bb82cc799153f5888de5c513f338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:50:56 +00:00
Haijie Hong
d260f67aac
Merge "Update backgroundcolor of advanced bt header image" into main
2024-10-24 03:31:25 +00:00
Howard Chen
00143bf156
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I3a815a0a9f65ad1814741e58f781301f9b9f6fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:30:08 +00:00
Howard Chen
db47f7bfe8
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: 75a0b01eb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I4543cb19cedf28eefdc5abebadc09c8ada257a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:29:36 +00:00
Jacky Wang
2d1770e4f7
[Catalyst] Migrate "Dark theme" settings
...
Bug: 375132235
Flag: com.android.settings.flags.catalyst_dark_ui_mode
Test: Manual
Change-Id: I40f305fe8d89feac84e2316c7a90c6eeb2b4a5fa
2024-10-24 11:27:07 +08:00
Howard Chen
75a0b01eb9
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: If2785ed3b6eb14fd67ee8d045c0d7c2463904ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:13:10 +00:00
Howard Chen
d498d8b580
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: Ic7af2a8f42525f1bca70b370f0c27a8175cb2a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:13:08 +00:00
Howard Chen
692f794e6f
Merge "Disable factory reset in DSU mode" into tm-dev
2024-10-24 02:51:24 +00:00
Fan Wu
60521ee2f9
Add WifiCallingScreen and corresponding TS flag
...
Bug: 372732219
Test: atest
Flag: com.android.settings.flags.catalyst_wifi_calling_settings
Change-Id: I3d78b6745e1127a0a7e73ec20ae95e9c9db2c139
2024-10-24 10:44:24 +08:00
Fan Wu
62c2800b3f
Fix test failure
...
Bug: 375011040
Test: atest
Flag: EXEMPT fix test
Change-Id: Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88
2024-10-24 02:34:57 +00:00
Jacky Wang
45a2c3e5b8
Refactor DarkModePreference for catalyst
...
Bug: 375132235
Flag: EXEMPT refactor
Test: N/A
Change-Id: I17a63ad62d3b9fced4305d464372f2eab5023e3f
2024-10-24 07:54:26 +08:00
Matías Hernández
5c751da617
Merge "Change the icon in the trigger segment for TYPE_DRIVING modes" into main
2024-10-23 18:06:09 +00:00
David Liu
b42e77308c
Merge "Migrate Adaptive Connectivity" into main
2024-10-23 17:47:48 +00:00
Treehugger Robot
19c977a03a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-10-23 17:35:00 +00:00
Treehugger Robot
024e643b85
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-10-23 17:35:00 +00:00
Treehugger Robot
16cd9324eb
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-10-23 17:35:00 +00:00
Treehugger Robot
384c432857
Merge "Removes overrides for shortcut-required service toggling." into main
2024-10-23 16:49:20 +00:00
Matías Hernández
1694adb1aa
Change the icon in the trigger segment for TYPE_DRIVING modes
...
Use the "settings gear" icon instead of the "car" icon.
Fixes: 369326738
Test: manual
Flag: android.app.modes_ui
Change-Id: I49d7089558fcd0b9e02020a8ad215bc23ebb8e0e
2024-10-23 16:13:57 +00:00
Chris Antol
ab9f9780ab
Merge "Add Lock Screen page skeleton and TS flag" into main
2024-10-23 16:00:05 +00:00
David Liu
b415befd53
Migrate Adaptive Connectivity
...
Add the skeleton of the Adaptive Connectivity
Bug: 368359961
Test: atest AdaptiveConnectivityScreenTest
Flag: com.android.settings.flags.catalyst_adaptive_connectivity
Change-Id: I45aa92635780230c8b89205cd13b7d968438e424
2024-10-23 14:52:48 +00:00
Treehugger Robot
d324df3997
Merge "Update WifiCallingSettingsForSub to inherit DashboardFragment. Controller logic will be refactored later" into main
2024-10-23 11:14:54 +00:00
Treehugger Robot
633e8dcd92
Merge "[Catalyst] Internet screen migration" into main
2024-10-23 10:23:46 +00:00
Yiyi Shen
56d56c4450
Merge "[Audiosharing] Update button background radius" into main
2024-10-23 10:07:56 +00:00
Shaowei Shen
f77fbbe473
Merge "[Physical Keybard] add Mouse key main page" into main
2024-10-23 09:55:56 +00:00
Fan Wu
059593f1b1
Update WifiCallingSettingsForSub to inherit DashboardFragment. Controller logic will be refactored later
...
Bug: 372732219
Test: atest
Flag: EXEMPT refactor
Change-Id: I8fc419acd0311cc5b11d78662fb6a13b2c61b169
2024-10-23 09:07:59 +00:00
Treehugger Robot
98bcb2297a
Merge "Avoid flakiness SLO" into main am: aa8b66f3ad
am: f5e3b586cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3310581
Change-Id: Ic5178e94295cb43b7f727670287d735da0fe98ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-23 08:58:18 +00:00
Treehugger Robot
f5e3b586cb
Merge "Avoid flakiness SLO" into main am: aa8b66f3ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3310581
Change-Id: I2e906f76248880a2fe2cb1ea36bf6a9783730080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-23 08:36:25 +00:00
Treehugger Robot
8b89ffb13c
Merge "Reafactor DataProcessManager Callback Function Logic" into main
2024-10-23 08:30:38 +00:00
Treehugger Robot
aa8b66f3ad
Merge "Avoid flakiness SLO" into main
2024-10-23 08:13:58 +00:00
Jason Chiu
2cf3e627ce
[Catalyst] Internet screen migration
...
- Add a flag for the migration
- Add the skeleton of the screen
Test: atest NetworkProviderScreenTest
Bug: 372733639
Flag: com.android.settings.flags.catalyst_internet_settings
Change-Id: Ia007b06501ef16e85df3e2f58536e8488d27bb3f
2024-10-23 15:34:39 +08:00
shaoweishen
0393a8165b
[Physical Keybard] add Mouse key main page
...
Add page for Mouse key, which contain a main switch toggle and list of
explain images.
demo video: b/346949547#comment38
images:
https://screenshot.googleplex.com/3mc6KnyMdvfAia9.png
https://screenshot.googleplex.com/489mTfSYg9KMUpW.png
Bug: 346949547
Test: atest SettingsRoboTests
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Change-Id: Ia40d5f071cc674ce0118d7ec8a4f0d5e914ce8b9
2024-10-23 07:24:12 +00:00
Zaiyue Xue
bdaadc471b
Reafactor DataProcessManager Callback Function Logic
...
Keep the current thread for period job flow; only call handler back to
the main thread in UI flow.
Bug: 374570240
Fix: 374570240
Test: manual
Flag: EXEMPT bug fix
Change-Id: Ie923dbbd858c0c7000fa16a6c639f56624b2ece5
2024-10-23 13:33:17 +08:00
Yiyi Shen
f6787fd88b
[Audiosharing] Update button background radius
...
Test: manual
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 366149567
Change-Id: I6aa2b0efb1e2d7b1d08d958fa065d739bef48812
2024-10-23 13:18:45 +08:00
SongFerng Wang
bca26d6151
Merge "Add the condition to hide the MMS messages preference" into main
2024-10-23 03:43:36 +00:00
Treehugger Robot
bf3a8d36f1
Merge "Remove dependencies on the 1-variant fallback" into main am: e56d23c121
am: 1dd30843d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3317680
Change-Id: If8405e6621b2a7f7a4bf9d6b5e2f0938a6c7651b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-23 03:05:30 +00:00
Treehugger Robot
1dd30843d0
Merge "Remove dependencies on the 1-variant fallback" into main am: e56d23c121
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3317680
Change-Id: I561bf2f17934bcd53afa64048507a35125d8b4f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-23 02:43:14 +00:00
Treehugger Robot
e56d23c121
Merge "Remove dependencies on the 1-variant fallback" into main
2024-10-23 02:06:03 +00:00
Bill Yi
b365c36473
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I46550a2406a93939b48765261058dd386479bb8b
2024-10-22 17:22:26 -07:00