Bill Yi
c2dae62abf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf48d5b7e5
-s ours am: 509dca3230
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I3918876175c5561c139ff6225b6daaf482bef723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:32 +00:00
Treehugger Robot
49d0bded17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 6ab2e734bd
-s ours am: df0f56a8ba
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I2ef6af6b38ec98392192b73d75dca61916b53fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:27 +00:00
Bill Yi
3e3c8df295
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5892f6b9cf
-s ours am: 707f62a539
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I8144a916095cefbebe26e032673bde8bf815d57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:24 +00:00
Treehugger Robot
e199a9e131
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9bb494666f
-s ours am: 8c5e7cf31b
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I770b82d92a407c2852c97f0d28ad55388d4de89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:15 +00:00
Bill Yi
437f820a37
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf
-s ours am: 1e3c0162cb
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I452e88d257b7b8c66d8721929a5aca81843e939c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 16:08:03 +00:00
Yiyi Shen
df58c45702
Merge "[Audiosharing] Fix add the secondary buds to audio sharing" into main
2024-11-27 11:08:28 +00:00
Treehugger Robot
ed4e2b8fc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 7fb8f02f4e
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I5595a4c81cb5fe774cf988e3f93a314f9dcfac7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:49 +00:00
Bill Yi
509dca3230
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf48d5b7e5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I0b7996dbdc864d14de0394caeb2db72db91f5ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:44 +00:00
Treehugger Robot
df0f56a8ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 6ab2e734bd
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I7b613e588c8f201b477b9f432ffecd45a0803cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:40 +00:00
Bill Yi
707f62a539
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5892f6b9cf
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: Ie7782d76d64a5328885623a27758673efaebe683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:37 +00:00
Treehugger Robot
8c5e7cf31b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9bb494666f
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I0addb62b8b0203f7dd9a15fc45ef5d7c37435d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:31 +00:00
Bill Yi
1e3c0162cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: Id56e72a5be3a8140c3a333acf3af83175b690349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:09 +00:00
Azhara Assanova
76b535473d
Merge "[AAPM] Update ActionDisabledByAdminDialog and ExternalSourcesDetails strings" into main
2024-11-27 10:45:34 +00:00
Pawan Wagh
d0ffb9cea6
Merge "Add AppInfo setting for page size appcompat" into main
2024-11-27 10:25:02 +00:00
Yiyi Shen
6eabebec54
[Audiosharing] Fix add the secondary buds to audio sharing
...
onBroadcastMetadataChanged will trigger multiple times between adding
sinks to audio sharing. Avoid clean up device candidate list in
onBroadcastMetadataChanged
Test: manual
Bug: 381166680
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I66693028478303b07879f5e53e60e2128aa9b114
2024-11-27 17:19:23 +08:00
Pawan Wagh
57ca4d313e
Add AppInfo setting for page size appcompat
...
Adding preference which set the page size app compat
for given app.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: page_size_app_compat_setting
Bug: 371049373
Change-Id: I91d014594e99e174f55010ca57aa19edc2071255
2024-11-27 05:48:12 +00:00
Treehugger Robot
13d90e8024
Merge "Expose the regional preferences page" into main
2024-11-27 03:45:39 +00:00
Zaiyue Xue
54cc16fd91
Merge changes from topics "battery_header_bar0", "battery_header_bar06", "battery_header_bar1" into main
...
* changes:
[PixelCare] Catalyst migration for battery header
Remove BatteryHeaderPreferenceController usage in PowerUsageSummary.
Split battery header text to a separated preference
2024-11-27 02:17:04 +00:00
Treehugger Robot
7fb8f02f4e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
6ab2e734bd
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
9bb494666f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Aishwarya Mallampati
25277a0e8f
Convert hidden SatelliteManager APIs to System APIs.
...
Convert hidden CarrierRoamingNtnModeListener in TelephonyCallback to
System API as well.
Bug: 373955860
Test: Manually tested SMS/MMS/DATA/CALL
Test: 380124630
FLAG: com.android.internal.telephony.flags.satellite_system_apis
Change-Id: I3260f84a4603866b468b187624acf97bf02f31ee
2024-11-26 22:09:52 +00:00
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
cf48d5b7e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c78d3f28c0335fa9d6d077568abd795623d8fd7
2024-11-26 07:03:26 -08:00
Bill Yi
f76efce0bf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1f83a21167e2ca81b94545b84bdb2420f013758
2024-11-26 07:01:41 -08:00
Bill Yi
5892f6b9cf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8f4b944635888cfc4597b3a9269eb5462cb01c3b
2024-11-26 07:00:24 -08: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
danielwbhuang
46a7540510
Expose the regional preferences page
...
1. Link ACTION_TEMPERATURE_UNIT_SETTINGS to TemperatureUnitFragment
2. Link ACTION_FIRST_DAY_OF_WEEK_SETTINGS to FirstDayOfWeekItemFragment
Bug: 381038747
Flag: android.provider.system_regional_preferences_api_enabled
Test: use test app to try intent ACTION
Change-Id: I7f8942a506a8252ebd10ee70237b51cd1923718a
2024-11-26 19:42:17 +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
Azhara Assanova
47e665802b
[AAPM] Update ActionDisabledByAdminDialog and ExternalSourcesDetails strings
...
The new advanced protection support intent will be launched by the
existing ActionDisabledByAdminDialog if the enforcing admin of a certain
restriction is advanced protection. To determine that, Change-Id
If931dcddad508f88aac1280b587da4767b937875 introduces an API to query the
enforcing admin.
In addition, this change updates ExternalSourcesDetails to display
a disabled by advanced protection string in the preference summary.
Tests will be written in a follow up change.
Bug: 358229113
Bug: 369361373
Test: manual
Test: atest ActionDisabledByAdminDialogTest
Test: atest ExternalSourcesDetailsTest
Test: atest LocationInjectedServicesPreferenceControllerTest
Flag: android.security.aapm_api
Flag: android.security.aapm_feature_disable_install_unknown_sources
Change-Id: Icedef421d65f7ccde6562734e39a87d4458567ff
2024-11-26 10:20:18 +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
Zaiyue Xue
8e6066f5d6
[PixelCare] Catalyst migration for battery header
...
NO_IFTTT=initialization
Bug: 372774754
Test: manual
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Icc1c46069147830b3360a467ffc2e666dadd3ddd
2024-11-26 14:38:16 +08:00
Zaiyue Xue
47d8e1daee
Remove BatteryHeaderPreferenceController usage in PowerUsageSummary.
...
This is a no-op refactor. This change makes the BatteryHeaderPreference Catalyst migration doesn't depend on PowerUsageSummary.
Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: I3d8d2856036f6840a0a163c35668f55baee487ab
2024-11-26 14:36:16 +08:00
Hung-Yeh Lee
edfe2a3f24
Update resolution name for screen resolution page
...
Use "Max resolution" to avoid confusion with Full HD.
Bug: 380988346
Flag: EXEMPT resource only update
Test: Open settings > display > resolution
Change-Id: I77923c60d9af3757d207cda9d33d9b40ccdc5462
2024-11-26 14:03:22 +08:00