Bill Yi
578d019e6e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-16 19:59:03 +00:00
Lifu Tang
dc54d60a48
Merge "Fix capitalization in location settings footer" into main
2024-07-16 19:20:32 +00:00
Lifu Tang
7301e6a098
Fix capitalization in location settings footer
...
Bug: 191301017
Flag: EXEMPT resource only update
Change-Id: Id2eeeb3687c4e6255c222615d265771a3e36438e
2024-07-16 19:20:09 +00:00
Automerger Merge Worker
fe037fff2b
Merge changes from topic "am-3c320492c6064dff82f4c26616d2a5e5" into main
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f6d9c8f8da
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1b214cb88
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c2d30c8e73
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22eb84ad97
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8f3f44e
-s ours
2024-07-16 17:56:51 +00:00
Treehugger Robot
c4419857d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f6d9c8f8da
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28329101
Change-Id: I66ec87b501846e5912e0984b74bd00a486fc3583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:26 +00:00
Bill Yi
49c265ae11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1b214cb88
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28329101
Change-Id: I57c769ad5519461c36cce2719bab014d9d479d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:22 +00:00
Treehugger Robot
8467849606
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c2d30c8e73
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328378
Change-Id: I305b29f837ebe00f7eb99a5f6804c6f811af5831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:19 +00:00
Bill Yi
d2fac657d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22eb84ad97
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328378
Change-Id: Ica383cb05ca9c312477eb2c195b0300c3c98d910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:09 +00:00
Bill Yi
a6a2746913
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8f3f44e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328375
Change-Id: I7f20db98e29912b35d79ed16422b73969fb0d776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:06 +00:00
Treehugger Robot
13cdbdf68a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 8e2e6d144a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28327438
Change-Id: I43f2949256eed85421a7c7a3a966b635adb4129f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:52:26 +00:00
Bill Yi
fe0242f1fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ca881be1
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28327438
Change-Id: I6257dbed9ef8580d1669291be30dcdc0ffdf0cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:52:19 +00:00
Bill Yi
f4222109e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f0d501ae0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328373
Change-Id: I449aa81c3da0c0441bfb1edc156ec08eff740fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:51:36 +00:00
Treehugger Robot
f6d9c8f8da
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-16 17:36:05 +00:00
Treehugger Robot
c2d30c8e73
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-16 17:36:05 +00:00
Treehugger Robot
8e2e6d144a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-16 17:35:19 +00:00
Matías Hernández
d133ec93ab
Merge "Distinguish the profile of DND-bypassing apps" into main
2024-07-16 09:15:54 +00:00
Matías Hernández
da3ae255e3
Distinguish the profile of DND-bypassing apps
...
Bug: 353273192
Test: atest ZenModeAppsLinkPreferenceControllerTest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I31d8836dbba38d04c9ab3b3180025cb8ddcfbe6d
2024-07-16 08:59:53 +00:00
Haijie Hong
de9d706146
Merge "Determine LeAudio toggle visibility after mIsLeAudioOnlyDevice is initialized" into main
2024-07-16 08:14:44 +00:00
Haijie Hong
7a40ecd953
Determine LeAudio toggle visibility after mIsLeAudioOnlyDevice is initialized
...
Bug: 352431349
Test: atest BluetoothDetailsProfilesControllerTest
Flag: com.android.settings.flags.hide_le_audio_toggle_for_le_audio_only_device
Change-Id: Ic6a8327f7c8e680a29dfd82407ac8304fc25cf89
2024-07-16 14:14:52 +08:00
Yiyi Shen
9eaf954e19
Merge "Fix dup preference key on Connected devices page" into main
2024-07-16 02:45:44 +00:00
Bill Yi
a1b214cb88
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I705542061755b43497171efdf1f9883e20b45995
2024-07-15 19:24:32 -07:00
Bill Yi
22eb84ad97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3241e023c3da29375d7f385d864725c1155762ae
2024-07-15 19:21:37 -07:00
Bill Yi
cfff5ea92e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f30248de4bb1ecf16f8d752136e5dc8763930f6
2024-07-15 19:19:51 -07:00
Bill Yi
42e8f3f44e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33c17b49df959e7f2a8512574263800076c271f3
2024-07-15 19:18:23 -07:00
Bill Yi
9f0d501ae0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7bb34378cecb16ddb9f073dc8965808fc18f8b03
2024-07-15 19:16:05 -07:00
Bill Yi
c1ca881be1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic36c209805a453537b7de990a9645a1aab79e6d6
2024-07-15 19:14:40 -07:00
Treehugger Robot
f1cd781ed1
Merge "Move PreferenceControllers to member variables to prevent memory leak" into main
2024-07-15 22:41:43 +00:00
Chun-Ku Lin
ec61f8bea3
Move PreferenceControllers to member variables to prevent memory leak
...
- Move PreferenceControllers to xml
- Clean up the PreferenceController so that it's less tied to a fragment
- Update and clean up the related robolectric test, so there are less
mocks needed
Bug: 352606511
Test: manually check the Color Correction screen is shown correctly, and
choosing color correction options are reflected correctly
Test: atest DaltonizerRadioButtonPreferenceControllerTest
Test: atest ToggleDaltonizerPreferenceFragmentTest
Flag: EXEMPT (moving controller to xml can't be flagged)
Change-Id: I89b9366cfd7a398bb0572d34226d31d49373fd94
2024-07-15 21:34:14 +00:00
Pat Manning
c8c8c53760
Merge "Update Touchpad settings page to include mouse." into main
2024-07-15 10:52:10 +00:00
Treehugger Robot
2db5d1618f
Merge "Show less secure warning in Network details settings" into main
2024-07-15 08:00:42 +00:00
Weng Su
05b28d24c3
Show less secure warning in Network details settings
...
- Show warning when device connected to WEP protocol
Bug: 331973632
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WepLessSecureWarningControllerTest
Change-Id: I54a9bafb2c672db44d47259d6acc49c02046cb81
2024-07-15 14:51:25 +08:00
Chaohui Wang
02849149de
Merge "Revert^2 "Support search "Mobile data""" into main
2024-07-15 05:35:40 +00:00
Vincent Wang
8d235a2fc8
Merge "Remove package biometric2 from AOSP settings" into main
2024-07-15 05:00:06 +00:00
Chaohui Wang
cacc9a88b2
Revert^2 "Support search "Mobile data""
...
This reverts commit 979de75952
.
Reason for revert: Failed CarDeveloperOptions tests fixed.
Change-Id: Ic0bdf47ab3cb40dbadebb738c0c5842e4e1bf9c8
2024-07-15 02:03:06 +00:00
Chris Antol
7e1ba1c03a
Merge "Support dynamic injected preference icons from raw data" into main
2024-07-12 22:57:50 +00:00
Chris Antol
969fc9639b
Support dynamic injected preference icons from raw data
...
Flag: com.android.settings.flags.support_raw_dynamic_icons
Bug: 351884562
Test: Registered an injected preference in another app locally, providing icon dynamically using new metadata field
Change-Id: I80a5e6804b9beab343c0068753277948a3855865
2024-07-12 22:57:37 +00:00
Ioana Alexandru
457277d6f5
Move TestModeBuilder to SettingsLib
...
This will allow us to use it from both settings and systemui.
Bug: 346519570
Test: builds
Flag: TEST_ONLY
Change-Id: I3b5ea50458f28d55db275cbd9de93f55f522d5c7
2024-07-12 18:19:15 +02:00
Pechetty Sravani
dc5469cf24
Merge "Revert "Support search "Mobile data""" into main
2024-07-12 09:34:44 +00:00
Kai Zhou
d99198f4ff
Merge "Wifi Sharing page uses a new enum for telemetry." into main
2024-07-12 07:55:51 +00:00
Haijie Hong
d3a67dc480
Merge "Check all member devices to determine whether it's LeAudio-only device" into main
2024-07-12 07:44:43 +00:00
Pechetty Sravani
979de75952
Revert "Support search "Mobile data""
...
This reverts commit 50d9e342e8
.
Reason for revert: Droidmonitor created revert due to b/352668970. Will be verifying through ABTD before submission.
Change-Id: I5e0c48830425c51963b7669b75979cb8b67e770c
2024-07-12 07:40:28 +00:00
Angela Wang
e2c83caee9
Merge "Fix text cropping in pairing dialog" into main
2024-07-12 06:55:48 +00:00
Chaohui Wang
9325291b9f
Merge "Support search "Mobile data"" into main
2024-07-12 05:39:09 +00:00
Treehugger Robot
3ba331528c
Merge "Clean up SubscriptionInfoEntity unused fields" into main
2024-07-12 05:17:46 +00:00
Haijie Hong
bfcd25edca
Check all member devices to determine whether it's LeAudio-only device
...
Bug: 352431349
Test: atest BluetoothDetailsProfilesControllerTest
Flag: com.android.settings.flags.hide_le_audio_toggle_for_le_audio_only_device
Change-Id: I3697b4f3abf5f789100b63f0b7a01c3b78d70a7f
2024-07-12 13:09:36 +08:00
Chaohui Wang
50d9e342e8
Support search "Mobile data"
...
- Added SpaSearchRepository to index the SPA search data.
- Added SpaSearchLandingActivity, which can only be called by SI.
Fix: 346776183
Flag: EXEMPT bug fix
Test: manual - search "Mobile data"
Test: unit test
Change-Id: Icaff41fe085edd371fd75bc8101dd52028f90da5
2024-07-12 03:52:03 +00:00
David Lin
bbd5d8885e
[automerger skipped] Merge "AiCore reattribute feature" into 24D1-dev am: c7de1ca1ed
-s ours
...
am skip reason: Merged-In Icc9a475a71f189e72bf06f9a0b4c23380a90a603 with SHA-1 29f73d68fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28128298
Change-Id: I3e0c1bcc16c86ae3932d95d994bd49ad35f2d18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-12 03:11:28 +00:00
YK Hung
290ad1e2ef
[automerger skipped] AiCore reattribute feature am: f8b46c01e8
-s ours
...
am skip reason: Merged-In Icc9a475a71f189e72bf06f9a0b4c23380a90a603 with SHA-1 29f73d68fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28128298
Change-Id: I134ada97ff61665e7523b8b25d74ae30a26199e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-12 03:11:21 +00:00
David Lin
c7de1ca1ed
Merge "AiCore reattribute feature" into 24D1-dev
2024-07-12 02:56:11 +00:00
Treehugger Robot
33549c6dc7
Merge "Add Settings for vector-specific PointerIcon stroke colors." into main
2024-07-12 02:04:21 +00:00