Treehugger Robot
38ec311d40
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 0a89a72054
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30595286
Change-Id: I5cc124c9da889fec6f18bfdb9100c4d1fe0e1c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 20:40:35 +00:00
Bill Yi
8680ef2f70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c47df6271a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30595286
Change-Id: Ib02099972fde2f2045b2ca8a0ddfd5d7b593ca80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 20:40:32 +00:00
Treehugger Robot
e68bd9f854
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: f33c479f74
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30595285
Change-Id: Ia077b54f3b534d12d5e3ab8c0863d5bb67eb1b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 20:40:29 +00:00
Bill Yi
449fea1bbc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7230cbcb61
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30595285
Change-Id: I14e391f6f349bd5588956eb43e20f4921c4904da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 20:40:24 +00:00
Bill Yi
dbab882825
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ff0ee9c20
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30594937
Change-Id: I6fd3f613dab3e4bceb2857327354e588fe702431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 20:40:02 +00:00
Treehugger Robot
0a89a72054
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-11-26 20:37:07 +00:00
Treehugger Robot
f33c479f74
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-11-26 20:37:07 +00:00
Treehugger Robot
8a995f3762
Merge "Updating Setting EvenDimmer->ExtraDim" into main
2024-11-26 15:52:20 +00:00
Bill Yi
c47df6271a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c1246a4b34c6b09a42c05153c0e3f015d475df1
2024-11-26 05:54:19 -08:00
Bill Yi
8ff0ee9c20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7537a8c074c8da6de687d2b80e3f8ed7c9505ec2
2024-11-26 05:52:36 -08:00
Bill Yi
7230cbcb61
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9af8e5aeb3c8ab91dbc5695cfe84437bc8bd0904
2024-11-26 05:51:12 -08:00
Harry Cutts
fa4532f246
Merge "Disable checkcolor hook" into main
2024-11-26 11:27:16 +00:00
Shawn Lin
e0c0b300da
Merge "Add aconfig for biometric onboarding education" into main
2024-11-26 11:21:25 +00:00
Treehugger Robot
5059b71955
Merge "Update comments to point to the new location of event.logtags." into main am: fa6413ed0b
am: 60f7c04dac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3375731
Change-Id: Ibd83f213d51ff27f94084c70106c55285c95ccea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 11:06:46 +00:00
Treehugger Robot
60f7c04dac
Merge "Update comments to point to the new location of event.logtags." into main am: fa6413ed0b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3375731
Change-Id: I6a6912059c1f4c688c60deacd9382e0fa6355491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 10:45:28 +00:00
Treehugger Robot
fa6413ed0b
Merge "Update comments to point to the new location of event.logtags." into main
2024-11-26 10:19:51 +00:00
Shawn Lin
d8edea8154
Add aconfig for biometric onboarding education
...
Bug: 370940762
Test: m
Flag: com.android.settings.flags.biometric_onboarding_education
Change-Id: I1517feecdb6baff2cf1f97c951c6a4c18e342c45
2024-11-26 09:15:09 +00:00
Daniel Huang
9fa8789fae
Merge "Modify App languages entry" into main
2024-11-26 08:33:48 +00:00
danielwbhuang
f54048ad4c
Modify App languages entry
...
1. add a new category
2. move App languages preference to the new category
Bug: 379962955
Flag: com.android.settings.flags.regional_preferences_api_enabled
Test: check hsv and atest ManageApplicationsTest, AppLocalePreferenceControllerTest
Change-Id: Ie6bdcb1899b705cff48ce3be9c0d0b060be8ee72
2024-11-26 15:15:29 +08:00
Eric Lin
d6f139b389
Update comments to point to the new location of event.logtags.
...
event.logtags was moved from system/core/logcat to system/logging/logcat in Android 12 by aosp/1454058.
Change-Id: I8a6d046bf31e1e0d28862664f5cc0e2e941ab60c
BUG: 168791309
Flag: DOCS_ONLY
Test: Local build
2024-11-26 07:13:23 +00:00
Treehugger Robot
29bb748539
Merge "Make UI and wording dynamically show on" into main
2024-11-26 04:47:40 +00:00
tomhsu
db43380380
Make UI and wording dynamically show on
...
- Satellite preferences may show on by deifferent reason. To fullfill
these conditions, let category be able to dynamically show on base on
the preference exist or not.
- Show string of Connectivity or Messaging for service state change.
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/378408939
Test: atest pass
Test: make pass
Change-Id: Ibb0f9089805bb35d0334603e55d292c9883262ff
2024-11-26 02:44:20 +00:00
Haijie Hong
0a06641369
Merge "Add logging for LE Audio toggle enable/disable" into main
2024-11-26 02:22:07 +00:00
Riley Jones
3b5b88f650
Merge "Makes all custom caption settings unsearchable when custom captions are not active." into main
2024-11-25 21:40:20 +00:00
Matthew DeVore
0f7bf3062a
Merge "Topology pane in extended displays list" into main
2024-11-25 20:59:26 +00:00
Daniel Norman
b4dbc50d6a
Merge "Cleanup flag "check_prebundled_is_preinstalled"" into main
2024-11-25 20:45:50 +00:00
Daniel Norman
9808ee15bd
Merge "Cleanup flag "audio_balance_state_description"" into main
2024-11-25 20:45:16 +00:00
Riley Jones
6f8e823e0e
Makes all custom caption settings unsearchable when custom captions are not active.
...
Unifies all custom caption controllers under a base controller, whose searchability is directly determined by CaptionHelper#getCustomCaptionAvailability().
Test: atest CaptionHelperTest
Bug: 353757664
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Change-Id: If44e6eca4c72aa4413cd0a6e8735dbb22c7abe62
2024-11-25 18:59:01 +00:00
Bill Yi
8eb7d1d373
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-25 18:54:49 +00:00
Xin Li
0998b9c893
[automerger skipped] Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future am: 207c4c5c5e
-s ours
...
am skip reason: Merged-In I4e2a72a80f68579d60466e859370b6fd93a8cd23 with SHA-1 aa322bc4f7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29739636
Change-Id: Ie956be5df6cc09613a8f2bc480ce07868b900981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 18:19:54 +00:00
Xin Li
8bb37c741e
[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 521a712349
-s ours
...
am skip reason: Merged-In I4e2a72a80f68579d60466e859370b6fd93a8cd23 with SHA-1 aa322bc4f7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30532889
Change-Id: I167cb9a9147dc517def2e14a9e7b5da28229daaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 18:18:43 +00:00
Treehugger Robot
ba78d0de9f
Merge "[Catalyst] Update ColorAndMotionScreen" into main
2024-11-25 18:18:37 +00:00
Matthew DeVore
6f28e1a3c7
Topology pane in extended displays list
...
Show an empty topology pane in the extended displays list. Even show
when no external display is connected.
This will be tweaked in a follow-up CL to include the built-in display
in the pane and the displays list.
This fixes an issue where the displays list is not shown when *no*
external displays are connected, which was not the intent of the flag.
The previous flag CL ag/30358161 only respected the flag when 1 external
display was connected.
Based on mocks at go/al-mm-figma
Bug: b/352650922
Test: reboot with zero displays attached and verify display list and pane are shown
Test: on al-13 device, make the activity fullscreen and verify the margins on left and right of pane are larger
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Change-Id: If39fefe943a26c817fa6f636f21eb8aaa080adde
2024-11-25 12:06:04 -06:00
Xin Li
207c4c5c5e
Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future
2024-11-25 17:28:24 +00:00
Daniel Huang
cc267e6a30
Merge "Use flag to control the hierarchy tree changes" into main
2024-11-25 15:34:57 +00:00
danielwbhuang
d53777f96d
Use flag to control the hierarchy tree changes
...
This change includes these:
Regional preferences
-Temperature
-First day of week
-Numbering system
-Footer preference
Bug: 379962955
Flag: com.android.settings.flags.regional_preferences_api_enabled
Test: check hsv and atest FirstDayOfWeekControllerTest, NumberingSystemControllerTest, TemperatureUnitControllerTest
Change-Id: Icb628640c05f1f4bb974416c35dce16a14f84a6c
2024-11-25 21:49:07 +08:00
Shawn Lin
e1573f84b3
Merge "Add aconfig for biometric onboarding education" into main
2024-11-25 11:30:12 +00:00
Treehugger Robot
999cf6ec6c
[automerger skipped] Merge "Fix whenNoInstaller_notDisplayed" into main am: c10f2c69f5
-s ours am: eb833001aa
-s ours
...
am skip reason: Merged-In If21215b81008c03a6b6ad2a77a90073a6d708390 with SHA-1 512141619d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3373611
Change-Id: I7e727bc57bf8e0be3998bc4f126d3e2fa0af3d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 09:44:19 +00:00
Chaohui Wang
e7d8278293
[automerger skipped] Fix whenNoInstaller_notDisplayed am: a233ca783a
-s ours am: a1647633b2
-s ours
...
am skip reason: Merged-In If21215b81008c03a6b6ad2a77a90073a6d708390 with SHA-1 512141619d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3373611
Change-Id: I844486c09886cbf597e0c357ca44e601e8ec00bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 09:44:15 +00:00
Shaowei Shen
1085bb4739
Merge "[Physical Keybaord] Add keyboard touchpad/Mouse page - part1" into main
2024-11-25 09:31:58 +00:00
Treehugger Robot
eb833001aa
[automerger skipped] Merge "Fix whenNoInstaller_notDisplayed" into main am: c10f2c69f5
-s ours
...
am skip reason: Merged-In If21215b81008c03a6b6ad2a77a90073a6d708390 with SHA-1 512141619d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3373611
Change-Id: I68deb2755958c21e15b0df1921b2bcb43eba281e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 09:24:00 +00:00
Chaohui Wang
a1647633b2
[automerger skipped] Fix whenNoInstaller_notDisplayed am: a233ca783a
-s ours
...
am skip reason: Merged-In If21215b81008c03a6b6ad2a77a90073a6d708390 with SHA-1 512141619d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3373611
Change-Id: I19d10f8b66ff4a6d4347431573af58c82451dfde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 09:23:57 +00:00
Shawn Lin
ae1cc05b8d
Add aconfig for biometric onboarding education
...
Bug: 370940762
Test: m
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I8650788097286958ce9b1874b8cee5cb5746f405
2024-11-25 09:20:00 +00:00
Treehugger Robot
c10f2c69f5
Merge "Fix whenNoInstaller_notDisplayed" into main
2024-11-25 08:39:57 +00:00
Chaohui Wang
a233ca783a
Fix whenNoInstaller_notDisplayed
...
Which is forgot to update in Icd5559bce06c059844269d70926b3c0b39589edb
Bug: 355270127
Flag: EXEMPT test only
Test: atest AppInstallerInfoPreferenceTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:512141619d041cc01e38f3c9b07a84b83a6a1354 )
Merged-In: If21215b81008c03a6b6ad2a77a90073a6d708390
Change-Id: If21215b81008c03a6b6ad2a77a90073a6d708390
2024-11-25 08:08:08 +00:00
Jason Chiu
1d0752d0e8
[automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc
am: 13b1a03e27
am: f45744f85b
am: eff2f8b3e3
am: 0f1943ce36
-s ours am: 83b6988187
-s ours am: 00a94388c6
-s ours am: 197f7ec759
-s ours am: 30427fa945
-s ours
...
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372
Change-Id: Ic1f61f5690bd08e9990d238bce11d9cae410af7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 07:09:35 +00:00
Jason Chiu
9e65176d17
[automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc
am: 13b1a03e27
am: f45744f85b
am: eff2f8b3e3
am: 165151052c
-s ours am: 57ad521d75
-s ours am: 24c6f0b462
-s ours am: 182838b0b4
-s ours
...
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372
Change-Id: Ic789335479c6d9954fcdb20a89309e2d0a0ef1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 07:09:20 +00:00
Haijie Hong
aaac02499a
Merge "Fix blank area at the bottom of device details page" into main
2024-11-25 07:01:27 +00:00
Jason Chiu
30427fa945
[automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc
am: 13b1a03e27
am: f45744f85b
am: eff2f8b3e3
am: 0f1943ce36
-s ours am: 83b6988187
-s ours am: 00a94388c6
-s ours am: 197f7ec759
-s ours
...
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372
Change-Id: I0e95b53f6acbe9d1449428fbe5c443f53afcf124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 06:46:19 +00:00
Jason Chiu
182838b0b4
[automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc
am: 13b1a03e27
am: f45744f85b
am: eff2f8b3e3
am: 165151052c
-s ours am: 57ad521d75
-s ours am: 24c6f0b462
-s ours
...
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372
Change-Id: Id19b6867f67c1e222e865e595a485c701f1f1050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 06:46:10 +00:00