PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,346 Commits 1 Branch 0 Tags
4dcd12f02c82b283278dac3c78233d33e9708e3c
Commit Graph

143346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
04ef86d174 Merge "Fix description when erase esim" into main 2024-09-12 01:25:16 +00:00
Riley Jones
23fd32c6d1 Quick fix for FAB fade setting summary 
Fixes the fade setting to properly set its summary when not disabled.

Flag: EXEMPT internal change
Bug: 349178637
Test: Check the settings page with navigation button mode and FAB button mode. Verify the summary of the fade setting is correct in both cases.
Change-Id: Ia87a634fd69e6098f1a0a658f788e69d10f2dbec
 2024-09-12 00:01:27 +00:00
Treehugger Robot
37bb8a3cdf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d387132098 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2444847dcd3ac2303a582468206551cc6b750990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:43:10 +00:00
Bill Yi
a2d18bd1df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83f6b71ae7 -s ours 
am skip reason: contains skip directive

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

Change-Id: I27176750a214257f213ab12e5e1d658019121c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:43:08 +00:00
Treehugger Robot
d5e786ea38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 0e72c6c9eb -s ours 
am skip reason: contains skip directive

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

Change-Id: I12c294fe61ce21548da9f9443d7a70921cee105a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:43:02 +00:00
Bill Yi
6000cc98db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecccb8c92f -s ours 
am skip reason: contains skip directive

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

Change-Id: I4921de780e0b411ac3320d9a8186dcf1b730f7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:42:47 +00:00
Treehugger Robot
de508d2620 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 41ac6310b3 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib419da3deddb4a382e1783f23ca7e6a02fcee2e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:42:35 +00:00
Bill Yi
bcb2de31e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d24d09091 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4b841caa6878041af60efe99899c89fb1ef8e221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:42:26 +00:00
Bill Yi
dae6a5de3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: feee29caf8 -s ours am: ffd51906c0 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icd006686184d61da8ae4c24e91ce24f31c6fd056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:41:34 +00:00
Bill Yi
e56fa4d1cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 905e347339 -s ours am: 1d89705c11 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic8de3a4410eaad59480c46ba76e9b8398e6298fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:41:29 +00:00
Bill Yi
39ef683d99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 110375b901 -s ours am: 7fe805ba53 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ifb278ab217d830abcfa0cb4b1503895f84fd875f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:41:26 +00:00
Bill Yi
b6403e9b6c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65d9c39a51 -s ours am: 1ecafa4265 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icc147ee7c229783ff1b412c7ca11000d5760d7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:41:17 +00:00
Bill Yi
59cda07483 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: ce0fa685e4 -s ours am: e642348450 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9a12a6784389decccfe026c024910f9ae848f362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:41:07 +00:00
Bill Yi
6dfe3b6a52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 730b913bc6 -s ours am: 3dbd7c54bd -s ours 
am skip reason: contains skip directive

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

Change-Id: I67e3bbb7bc0431b1e86b6bc9c3c424d61596e54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:41:03 +00:00
Treehugger Robot
d387132098 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-09-11 23:07:15 +00:00
Treehugger Robot
0e72c6c9eb Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-09-11 23:07:15 +00:00
Treehugger Robot
41ac6310b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-09-11 23:07:15 +00:00
Bill Yi
ffd51906c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: feee29caf8 -s ours 
am skip reason: contains skip directive

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

Change-Id: I5a82f9cc705d725f3c000fec95f181cc27d76bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:00:28 +00:00
Bill Yi
1d89705c11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 905e347339 -s ours 
am skip reason: contains skip directive

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

Change-Id: I123d9f94f21772c268f4ab114ee89e0cdadfd3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:00:22 +00:00
Bill Yi
7fe805ba53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 110375b901 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic89b524acd5125ca3220e0bbcfaaeb7fd678ef6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:00:18 +00:00
Bill Yi
1ecafa4265 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65d9c39a51 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ide486ac722c55d598195a8dfb003e3d9cb1b62f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 23:00:10 +00:00
Bill Yi
e642348450 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: ce0fa685e4 -s ours 
am skip reason: contains skip directive

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

Change-Id: I57344ae5ccb4e7c0d854ce6c3a915e69b2054a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 22:59:59 +00:00
Bill Yi
3dbd7c54bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 730b913bc6 -s ours 
am skip reason: contains skip directive

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

Change-Id: I21289bfbdaa4ff581272f87cc6b626bc12a05ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 22:59:52 +00:00
Bill Yi
feee29caf8 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-11 22:30:21 +00:00
Bill Yi
110375b901 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-11 22:30:21 +00:00
Bill Yi
ce0fa685e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-11 22:30:21 +00:00
Bill Yi
83f6b71ae7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie36b23e48077023708c6a7bf895ae49ecd4ee099
 2024-09-11 13:48:32 -07:00
Bill Yi
ecccb8c92f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4da9179b61e9fb32525708c49bd26a208754d65a
 2024-09-11 13:46:06 -07:00
Bill Yi
1d24d09091 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie7a6d17a7356827e2d823fa8f3e9fb312c5d210b
 2024-09-11 13:44:14 -07:00
Bill Yi
65d9c39a51 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If28bc3a57b9e98862b7f7fd5bc57167171e6009d
 2024-09-11 12:07:00 -07:00
Bill Yi
905e347339 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9205a5ec80240c5ca11946c6e03b4b0e11769c83
 2024-09-11 12:05:13 -07:00
Bill Yi
730b913bc6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I40a62c487bc7916eac67a878a59ce68a2139c694
 2024-09-11 12:03:50 -07:00
Treehugger Robot
06ab83eb50 Merge "Fix errorprone issues" into main am: eb2e9e4776 am: bdd44e5242 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258078

Change-Id: I1249c4cdae2cee729ac60d9e41507c7dc684621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 18:22:01 +00:00
Treehugger Robot
b55ded8fb1 [automerger skipped] Merge "Make java_sdk_library dependencies explicit" into main am: dd578b8274 am: d459385feb -s ours 
am skip reason: Merged-In I78dec317d4e74275287e3a5b7f5ffe2b10db05ab with SHA-1 9b946d241d is already in history

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

Change-Id: I2c342bd84c9c81a9431120c6ca7ea6f25297a450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 18:20:55 +00:00
Treehugger Robot
bdd44e5242 Merge "Fix errorprone issues" into main am: eb2e9e4776 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258078

Change-Id: Idaa9fc8fe53588c16959948de0f32ab74d5187ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 18:13:59 +00:00
Treehugger Robot
d459385feb Merge "Make java_sdk_library dependencies explicit" into main am: dd578b8274 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3247681

Change-Id: I367d149d944129e2c545bde70690733a235cae5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 18:10:52 +00:00
Treehugger Robot
eb2e9e4776 Merge "Fix errorprone issues" into main 2024-09-11 18:08:19 +00:00
Treehugger Robot
dd578b8274 Merge "Make java_sdk_library dependencies explicit" into main 2024-09-11 17:58:59 +00:00
Treehugger Robot
9b10974cca Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-11 17:46:39 +00:00
Treehugger Robot
5ac473d654 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-11 17:46:39 +00:00
Treehugger Robot
504944d170 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-11 17:46:39 +00:00
Matías Hernández
00e86639d8 Merge "Update "Dark Theme" Settings screen to account for Modes that can toggle it" into main 2024-09-11 15:57:46 +00:00
Haijie Hong
b2b0b655ea Merge "Fix tests after device rename button is moved" into main 2024-09-11 15:57:05 +00:00
Matías Hernández
1e49ce2482 Use the Modes icon in the "dummy" ModesActivity 
So that newly-created Modes Settings shortcuts have it (a different CL will update previous shortcuts).

Bug: 365545604
Change-Id: I74760bde4c40646b0571e0b7dad6383729f470f7
Test: manual
Flag: android.app.modes_ui
 2024-09-11 15:55:16 +00:00
Matías Hernández
5b26a37a7e Rename usages of ZenRule.isAutomaticActive() to isActive() in Settings 
Bug: 363193376
Test: N/A, automatic refactor
Flag: EXEMPT automatic refactor
Change-Id: Ice1ceccbe09e6206555b2f2b75bd7ea39d24dfd7
 2024-09-11 13:39:43 +00:00
Olivier Nshimiye
bf992fcfc7 Merge "Prompt user to set device lock before deleting private space from Reset options" into main 2024-09-11 11:07:23 +00:00
Haijie Hong
fb18978718 Fix tests after device rename button is moved 
BUG: 343317785
Test: atest BluetoothDeviceDetailsFragmentTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I3cb93f7128a1bb2a7d24b65772edf4b55e8f9bdf
 2024-09-11 18:24:25 +08:00
Matías Hernández
2a3e8b3070 Update "Dark Theme" Settings screen to account for Modes that can toggle it 
Bedtime is no longer a special case.

Fixes: 361592187
Test: atest com.android.settings.display.darkmode
Flag: android.app.modes_ui
Change-Id: Iddc5d8142d6bc0bb1f5c4ead876ee201c8818b12
 2024-09-11 11:52:50 +02:00
Chaohui Wang
6bca37ce4b Merge "Fix ResetNetworkConfirm erase esim twice" into main 2024-09-11 07:44:12 +00:00
Yiyi Shen
0e7d5fcf0d Merge "[Audiosharing] Add loading state dialog" into main 2024-09-11 05:55:24 +00:00