PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
145,923 Commits 1 Branch 0 Tags
8140765dbf881f13f5679ff67e9a57514c72f56c
Commit Graph

145923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
8140765dbf [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours am: 901e7377cc -s ours am: 1017ec16c0 -s ours am: b7c547504a -s ours am: 6d61f05f14 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: Ic755ae5c5d788eb768d52793328e65c383582a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:58:23 -08:00
Hao Dong
9393a8f7e1 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours am: 9cce9a26c7 -s ours am: a6b7b2ac39 -s ours am: d33c418fed -s ours am: 1257b21e99 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I462c21a11a4ba7b50c4b413b1c02108b557a9dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:58:14 -08:00
Hao Dong
04180c407c [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 2688ddf907 -s ours am: c62982e22d -s ours am: 744e8a83f6 -s ours am: 6680b3cb90 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: Id5c803c6df746797e647c4fd96cb2c2b219bd197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:56:49 -08:00
Hao Dong
6d61f05f14 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours am: 901e7377cc -s ours am: 1017ec16c0 -s ours am: b7c547504a -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I797c4957afe96d675712f828d258d1ade273cc73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:27:33 -08:00
Hao Dong
1257b21e99 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours am: 9cce9a26c7 -s ours am: a6b7b2ac39 -s ours am: d33c418fed -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: Ib58a62698e1e4ba64a0deab793348f72d46f8a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:27:30 -08:00
Hao Dong
6680b3cb90 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 2688ddf907 -s ours am: c62982e22d -s ours am: 744e8a83f6 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: Iff46f2acd9a26394c86f8caee1fa826cde859b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:27:04 -08:00
Hao Dong
b7c547504a [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours am: 901e7377cc -s ours am: 1017ec16c0 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I29859fc7393f21fda7196154f138c77780ba1b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:07:56 -08:00
Hao Dong
d33c418fed [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours am: 9cce9a26c7 -s ours am: a6b7b2ac39 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I6ae06245acbe0adcc7d202d397bd57c4b47b3e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:07:47 -08:00
Hao Dong
744e8a83f6 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 2688ddf907 -s ours am: c62982e22d -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: I1e7cfa4e05739f974a40e1a8043aab9f033c5589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:06:35 -08:00
Hao Dong
1017ec16c0 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours am: 901e7377cc -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: Id4db3bd172b7a97de8349092909135ed301f84bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 11:39:32 -08:00
Hao Dong
a6b7b2ac39 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours am: 9cce9a26c7 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I354f3ee7f14204925feadede8344e56451defa5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 11:39:29 -08:00
Hao Dong
c62982e22d [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 2688ddf907 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: I20dcc3ae5ad2cbdebf068f40a5f04b17f65377ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 11:38:26 -08:00
Ioana Alexandru
878f860fd3 Merge "Rename SettingsEnableZenModeDialog to EnableDndDialogFragment" into main 2025-01-16 08:39:36 -08:00
Julia Reynolds
f9b8f5af38 Merge "Align history styling with Settings" into main 2025-01-16 06:02:24 -08:00
Treehugger Robot
1ac39a1547 Merge "[Catalyst] Leverage PrimarySwitchPreferenceBinding" into main 2025-01-16 03:40:40 -08:00
Josep del Río
733f174fbd Merge "Fix multiple layouts marked as selected" into main 2025-01-16 01:33:54 -08:00
Jacky Wang
5a747c5a14 [Catalyst] Leverage PrimarySwitchPreferenceBinding 
NO_IFTTT=Catalyst only

Bug: 335132588
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I3a566d98500bd09526c1f8d34fb7c47e9dff68b7
 2025-01-16 17:13:20 +08:00
Treehugger Robot
fd7927bd79 Merge "[Catalyst] Rename BooleanPreference to BooleanValuePreference" into main 2025-01-16 00:55:23 -08:00
Zoey Chen
cc0c66a7ee Merge "[Settings] Create new controller for app language: suggested locale" into main 2025-01-16 00:29:41 -08:00
Zoey Chen
1daa1bb380 [Settings] Create new controller for app language: suggested locale 
Bug: 388199937
Test: manual
Flag: EXEMPT refactor
Change-Id: I45ddbfb460365e3ff4858de0c0411c7a46d49302
 2025-01-16 06:58:44 +00:00
Fan Wu
9782d86786 [Catalyst] Rename BooleanPreference to BooleanValuePreference 
Bug: 388167302
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor

Change-Id: Id447d0729b9202df96b610c3991f9d03dda8c811
 2025-01-15 22:34:35 -08:00
Treehugger Robot
03556af237 Merge "[Catalyst] Keep activity title in sync with PreferenceFragment" into main 2025-01-15 22:33:10 -08:00
Jacky Wang
8672a5e2ef [Catalyst] Keep activity title in sync with PreferenceFragment 
Fix: 390135885
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I0a8edbc6fa2a13d653a85ddfe36bd551e09796f8
 2025-01-16 12:26:13 +08:00
Chelsea Hao
97ccf7d696 Merge "Use LocalBluetoothLeBroadcastSourceState." into main 2025-01-15 19:11:20 -08:00
Jacky Wang
f597576f55 Merge changes from topic "catalyst" into main 
* changes:
  [Catalyst] Update metrics logging for AirplaneModePreference
  [Catalyst] Setup metrics logger for preference ui action
 2025-01-15 18:29:02 -08:00
Yuhan Yang
b95bc6620d Merge "Grey out scrolling speed slider bar" into main 2025-01-15 17:35:50 -08:00
Lorenzo Lucena Maguire
30943c6984 Merge "Update Double Press Power Button settings Strings" into main 2025-01-15 17:07:43 -08:00
Lorenzo Lucena Maguire
537a0d5257 Update Double Press Power Button settings Strings 
Test: atest
Bug: 389122652
Flag: EXEMPT xml only
Change-Id: I35136be0292b91c276928bb7138e5aecc6d0ec33
 2025-01-15 23:40:21 +00:00
Jacky Wang
22ce449414 [Catalyst] Update metrics logging for AirplaneModePreference 
NO_IFTTT=Catalyst only

Bug: 386330825
Bug: 389886085
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: I1d1fced2e24bd10839dd8f29a6fdd6f0bd04667c
 2025-01-16 07:30:38 +08:00
Jacky Wang
22d3b0420e [Catalyst] Setup metrics logger for preference ui action 
Bug: 389886085
Flag: com.android.settings.flags.catalyst
Test: atest&manual
Change-Id: I8c3ce6cbdeeefe7857132a40ea486d0f56928d7a
 2025-01-16 07:30:38 +08:00
Yongshun Liu
4d5fe47420 Merge "a11y: Add aconfig flag for magnification cursor following dialog" into main 2025-01-15 13:45:08 -08:00
Joshua Mccloskey
0e5717b3a6 Merge "Fixed Pattern SUW a11y bug" into main 2025-01-15 12:34:39 -08:00
Daniel Norman
e8f5daaf88 Merge "fix(HCT):Ensure HCT Notification ID does not conflict in the Settings app" into main 2025-01-15 11:34:28 -08:00
Joshua McCloskey
53ac9161d3 Fixed Pattern SUW a11y bug 
Test: Verified that setting up a patter nduring SUW no longer announces
a long peice of text after clearing the pattern.
Fixes: 386859835
Flag: EXEMPT bugfix

Change-Id: I7350aba7d3f0665f204758241af02eeaad8cc1d5
 2025-01-15 19:17:23 +00:00
Riley Jones
e5649f2ca6 Merge "Cleanup qs shortcut flag in OneHandedSettingsUtils" into main 2025-01-15 10:51:57 -08:00
Ioana Alexandru
07534f76a9 Rename SettingsEnableZenModeDialog to EnableDndDialogFragment 
We also renamed the base EnableZenModeDialog to
EnableDndDialogFactory, see other CL in topic.

Flag: EXEMPT trivial rename
Test: builds
Bug: 388261320
Change-Id: Iaa2043bbb8d1f62482d0c38d0951da4025676f27
 2025-01-15 17:42:23 +01:00
Yiyi Shen
9c1447536a Merge "[Audiosharing] Use setBroadcastToUnicastFallbackGroup to set primary" into main 2025-01-15 02:34:03 -08:00
Dipankar Bhardwaj
5488817d0a Merge "Use RELEASE_OR_PREVIEW_DISPLAY to show android build version" into main 2025-01-15 02:29:59 -08:00
Jakub Rotkiewicz (xWF)
a9e0e9ac94 [automerger skipped] Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main am: bc86ae0553 am: 06695ec0c3 -s ours 
am skip reason: Merged-In If9c710c0aaed7326b32dd2e7d5f3109de4047b97 with SHA-1 2c869d337c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451858

Change-Id: I8aceb2ad54754c2e8fb9e60236af13859b15528e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-15 02:21:34 -08:00
chenjean
ea305dc01e fix(HCT):Ensure HCT Notification ID does not conflict in the Settings app 
The current HCT notification uses NOTIFICATION_ID=1. The Settings app has a few other notifications also use NOTIFICATION_ID=1 like Bluetooth and Sim etc. When using the same NOTIFICATION_ID for a notification, it updates the existing notification, causing the original one to disappear. To avoid this, we use a unique NOTIFICATION_ID.

Bug: 388530317
Flag: EXEMPT resource only update
Test: manual
Test: atest HighContrastTextMigrationReceiverTest
Change-Id: Ieda6836190726b14cd3522f61e7992e5a5698231
 2025-01-15 18:15:38 +08:00
Jakub Rotkiewicz (xWF)
06695ec0c3 Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main am: bc86ae0553 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451858

Change-Id: I84b5d62aeab19b77148d5febf7a1cdc0a764d572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-15 01:57:08 -08:00
Treehugger Robot
48eb83affc Merge "Enhance contrast ratio for factory reset page" into main 2025-01-15 01:53:52 -08:00
chelseahao
47fcd60315 Use LocalBluetoothLeBroadcastSourceState. 
Test: atest
Bug: 308368124
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: Ic49a6782b63c91e95dd16898b5443585068e45f0
 2025-01-15 01:33:49 -08:00
Jakub Rotkiewicz (xWF)
3a5b40a5ca [automerger skipped] Merge "developer settings: remove unused a2dp Preference" into main am: b896665a32 am: 096a2fb990 -s ours 
am skip reason: Merged-In Ibd526fffddf5ea545afc437a5daee12bb1cf8746 with SHA-1 6b7a5073f0 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451857

Change-Id: I553231132708ab768db3227dcb67547b468c7a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-15 01:33:08 -08:00
Treehugger Robot
3849c6c6f0 Merge "[Catalyst] Remove BooleanValue usages" into main 2025-01-15 01:29:17 -08:00
Jakub Rotkiewicz (xWF)
bc86ae0553 Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main 2025-01-15 01:17:48 -08:00
Jakub Rotkiewicz (xWF)
096a2fb990 Merge "developer settings: remove unused a2dp Preference" into main am: b896665a32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451857

Change-Id: I2ebc9eb5d0b571be8838e0a2a77d7ed53f7ea7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-15 01:08:40 -08:00
Treehugger Robot
eb927665a3 Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main 2025-01-15 01:05:14 -08:00
Jakub Rotkiewicz (xWF)
b896665a32 Merge "developer settings: remove unused a2dp Preference" into main 2025-01-15 00:43:50 -08:00
Treehugger Robot
cc4a8539b9 Merge "Update background color for Settings homepage" into main 2025-01-14 23:55:47 -08:00