PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,958 Commits 1 Branch 0 Tags
9d84a8deb4a625505924df6e10cd3fbc875302f7
Commit Graph

139958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guojing Yuan
9d84a8deb4 Temporarily disable perm sync toggle 
Bug: 338469649

Test: unit test
Change-Id: Ie9d0c76c9b60129466c4a4f0c87a04d769918e5c
 2024-05-13 17:19:12 +00:00
Dennis Shen
4e139f091b Merge "fix container designation, it should be system_ext" into main 2024-05-01 18:40:13 +00:00
Chaohui Wang
377a7a3054 Check isActivationChangeableFlow in SimPreference 
Fix: 336209156
Test: manual - SimPreference
Change-Id: I8745e05dbab9701b9c046137fe76d98880a7b20a
 2024-05-01 14:15:36 +00:00
Treehugger Robot
72ba6ec2ca Merge "Rename Multiple users page to Users" into main 2024-05-01 09:47:56 +00:00
Dennis Shen
a4e178e6dd fix container designation, it should be system_ext 
Bug: b/338095619
Change-Id: I8ee2fd5fad529da2026af77f969abbf88e636ac3
 2024-04-30 22:06:28 +00:00
Treehugger Robot
b48c66ebea Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main 2024-04-30 21:44:24 +00:00
Joshua Mccloskey
968015c4e6 Merge "Restart fingerprint auth on cancel." into main 2024-04-30 20:51:44 +00:00
Tetiana Meronyk
177e852ea9 Rename Multiple users page to Users 
Ensure it is still searchable by "multiple users" prompt.

Bug: 336764972
Test: manual
Change-Id: I1126bfe601b75532882d6158d82be1a3b566aefc
 2024-04-30 18:48:40 +00:00
Oli Thompson
9b102c8921 Merge "Correctly unlock storage for work profiles with unified challenge" into main 2024-04-30 13:33:47 +00:00
Manish Singh
54461d2679 Merge "Apply personal filter when private tab not shown" into main 2024-04-30 09:55:34 +00:00
SongFerng Wang
42321d57a1 Merge "Correct the wording of mobile data summary" into main 2024-04-30 09:31:13 +00:00
Chaohui Wang
ad9c64fcdc Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: bbc3a352e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150958

Change-Id: I8398dcad2f0c0da66cf9c579c5adb5f4c91c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 08:12:16 +00:00
Chaohui Wang
bbc3a352e3 Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-30 07:47:30 +00:00
SongFerng Wang
07c7cd6702 Correct the wording of mobile data summary 
Bug: 337035270
Change-Id: Idc65508e8d4f68376fdfdba873ad049362445ac2
Test: verify the wording
 2024-04-30 07:28:09 +00:00
Tom Hsu
219fb8a3f6 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 0a8d830616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150955

Change-Id: I02b98dfea84be429e9a46dc8d0e3846dda29f203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 07:24:09 +00:00
Tom Hsu
0a8d830616 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-30 07:05:49 +00:00
Chaohui Wang
d3a69e3a58 [automerger skipped] Fix SubscriptionInfoListViewModelTest am: f97e76bc3f -s ours 
am skip reason: Merged-In I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0 with SHA-1 10f5bdabb4 is already in history

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

Change-Id: If7fe3b5301905ae957a1d8f614048cf95a6de853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 04:40:12 +00:00
Chaohui Wang
7bbd8fa4e3 Reapply "Create CallStateRepository.isInCallFlow" 
This reverts commit 93e4c65d3d.

Fixed the test by cherry-pick change
I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: atest SubscriptionInfoListViewModelTest
Change-Id: Id606d6ee90acd8a98de706d8533fed0aac96bff4
 2024-04-30 12:33:54 +08:00
Pawan Wagh
569313f809 Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe am: 07f71333bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3053444

Change-Id: Ic5a19b725b60cc466eba2879b50cdb7b2711bdfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 04:20:46 +00:00
Pawan Wagh
07f71333bc Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3053444

Change-Id: I17006093b2505056becde9efd2e4ccca3d76b4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 03:47:37 +00:00
Pawan Wagh
4c647972fe Merge "Set 16K dev option as checked by default for 16KB page size" into main 2024-04-30 03:33:54 +00:00
Chaohui Wang
f97e76bc3f Fix SubscriptionInfoListViewModelTest 
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
(cherry picked from commit 10f5bdabb4)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
 2024-04-30 03:32:08 +00:00
Tom Hsu
1b308f5df8 Revert^2 "Add a new warning dialog for Satellite mode" 
This reverts commit 15c90207e2.

Reason for revert: ag/27138142 shall fix the crash instead of reverted one.

Change-Id: Icf46fda7af9c9bb6921bc10de0f9c93926f42fac
 2024-04-30 02:17:15 +00:00
Treehugger Robot
874072f2df [automerger skipped] Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev am: c81e0cb16a -s ours 
am skip reason: Merged-In Iff40c1fb9a2463311768d24d09dfc3aeeee128f9 with SHA-1 1331449353 is already in history

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

Change-Id: Ide5d09321c0a04828409c261757db0894f51e725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 22:49:13 +00:00
Meng Wang
2998d4c93f [automerger skipped] When erasing an eSIM, verify the device screen PIN lock if one is set. am: bcf91ee6a7 -s ours 
am skip reason: Merged-In Iff40c1fb9a2463311768d24d09dfc3aeeee128f9 with SHA-1 1331449353 is already in history

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

Change-Id: Ib6f970f14d83ccb96a061b6fee599e0a7ae017b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 22:49:08 +00:00
Priyanka Advani
fe0eedf1e3 Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27145129

Change-Id: Ica49442da20fcea404ad95a2591506991a8e55b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 22:48:38 +00:00
Joshua McCloskey
4efd4c16f9 Restart fingerprint auth on cancel. 
Test: atest FingerprintSettingsFragmentTest
Fixes: 336572954
Change-Id: Ie64d509caf052271a141e466f5c840e92f5dc119
 2024-04-29 22:30:23 +00:00
Treehugger Robot
c81e0cb16a Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev 2024-04-29 22:24:00 +00:00
Priyanka Advani
134635786f Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-29 22:13:31 +00:00
Priyanka Advani
93e4c65d3d Revert "Create CallStateRepository.isInCallFlow" 
This reverts commit 6142ad927e.

Reason for revert: Droid-monitor created revert due to Build breakage in b/337914519. Will be verifying through ABTD before submission.

Change-Id: I300d5397de156fd0815965cfd99f0814f1365ffc
 2024-04-29 20:31:15 +00:00
Yuri Lin
1427faad9c Merge "Add flow for updating zen mode status on modes pages" into main 2024-04-29 19:16:27 +00:00
Bill Yi
89a8164090 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-29 18:54:41 +00:00
Bill Yi
2e900b9ddb Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-29 18:54:41 +00:00
Bill Yi
2025ab7323 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-29 18:54:41 +00:00
Bill Yi
dd0156bd7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 058348474d -s ours 
am skip reason: contains skip directive

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

Change-Id: I523e1f183bd069dbe5e164cd52194d37e7afe9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 17:28:30 +00:00
Yuri Lin
b77b2ec7c8 Add flow for updating zen mode status on modes pages 
The main responsibility for updating stored ZenMode data when updated is the Settings page, which reloads mode data whenever any changes are detected. This change adds a process for that Settings page to then update the ZenMode data associated with all controllers on that page.

Flag: android.app.modes_ui
Bug: 335259054
Test: manual with toy implementations
Change-Id: Ie1692da54d962c90378085d8bd8573e5b93f8eb6
 2024-04-29 12:55:42 -04:00
Treehugger Robot
e174766e2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 9d689ab23d -s ours 
am skip reason: contains skip directive

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

Change-Id: Idd0f3cebf97db84b725e215ffe0a382e34df4e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 16:44:41 +00:00
Bill Yi
9294b46e04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98a0240922 -s ours 
am skip reason: contains skip directive

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

Change-Id: If12a8e0954cb974a7f85ca4bad3503396dbda392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 16:44:35 +00:00
Treehugger Robot
3cd0026f4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 843206759f -s ours 
am skip reason: contains skip directive

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

Change-Id: Id39654e4984ea8b06e276ce57f0a0f5509bf0994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 16:44:30 +00:00
Bill Yi
379b972106 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67a07a4f9c -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib49d82d471ce155d45ee131c426d06f6f310652e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 16:44:17 +00:00
Jason Chang
51ee749d93 Merge "Fix the text under the "Setup for limited vision or head motion" is grayed out" into main 2024-04-29 16:32:43 +00:00
Treehugger Robot
9d689ab23d Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-29 16:32:33 +00:00
Treehugger Robot
843206759f Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-29 16:32:33 +00:00
Emilian Peev
114ebb5fec Merge "Settings: Replace EFV strings with Night, HDR extensions" into main 2024-04-29 16:18:50 +00:00
Manish Singh
4875662f48 Apply personal filter when private tab not shown 
Bug: 336327005
Fix: 337744275
Test: manual
Change-Id: I1c8cbc35f90cd39bb332f9a6b787473779249166
 2024-04-29 15:48:24 +00:00
Chaohui Wang
e4e6f0ecf4 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev am: ac55241fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139248

Change-Id: Ie5cde4ca5e04167a63fd41adfb5ccd1376a0d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:51:24 +00:00
Tom Hsu
b5391d1d3f Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 45549d928b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139078

Change-Id: Ib7b007734f3916b5caf652a79708f20f8df90bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:51:08 +00:00
Chaohui Wang
ac55241fc5 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev 2024-04-29 12:37:44 +00:00
Tom Hsu
45549d928b Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-29 12:34:55 +00:00
SongFerng Wang
55927a6318 Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev am: 33f5aa3897 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139247

Change-Id: I832da1d22799ba554696a66c2087c1ab6c84e201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:03:05 +00:00