PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,525 Commits 1 Branch 0 Tags
1bb84f9854d571a8a9390c4175108cbd6e9ae26c
Commit Graph

135525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
74efc70012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2b0e4dbd0496521a96f53c8fae1fe7a2c1042cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 17:24:53 +00:00
Bill Yi
26761dda7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6e4a225e38fcb3dbc783e16731268eefe2ed074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 17:24:35 +00:00
Bill Yi
a60c6f5165 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I794caf0136c807622ed7e644a3d70338e6b84074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 17:24:19 +00:00
Bill Yi
4b993f5fb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 256fc161e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80d1537bdbf0f9c7cccd60801862c8f8efee39bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 17:23:07 +00:00
Bill Yi
9d8a174cfb Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-09-08 16:49:29 +00:00
Bill Yi
fc870f9cfd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-09-08 16:41:46 +00:00
Bill Yi
cbcfd27eec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2527e8855f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66854fba10992dcc1167ee5e46a455f2fe3f05cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:34:49 +00:00
Bill Yi
c73ea3e3a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35b82f2c87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id10872171f85ed54aa08c12f31e2f19faa7471a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:34:45 +00:00
Bill Yi
05d03ffa6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 95ff1dbb5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6d613e50849eb6b1344c3d39abc4755add2322c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:34:42 +00:00
Bill Yi
ecee93546a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4023686444 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65c782b5f51c73fad30202d4aa5eee5e50c61075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:34:38 +00:00
Bill Yi
61d9f6cff0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bc882dc6a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If847c197dfcf419c9c6f8c6577d675ebd0ce9db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:34:29 +00:00
Bill Yi
a8854cdaaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4039be6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic837d59faaaa0cecfd161b95c8e3779f151e0d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:34:07 +00:00
Holly Jiuyu Sun
04960fa7c3 Merge "Change feature flag to device config flag." into udc-qpr-dev am: 54f96175a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24606922

Change-Id: I59758624d230915a39fa2d8055831dd18e75f957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 16:22:18 +00:00
Jason Chang
99882cb3bb Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: f6fdfb0ddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499558

Change-Id: I1d419997bcf7fe283f77532e942af04cd39a6161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 15:43:18 +00:00
Shivangi Dubey
c06568346c Merge "Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf" into udc-qpr-dev-plus-aosp 2023-09-08 15:13:50 +00:00
Zaiyue Xue
a93fd54d09 Save foreground_service and cached consumed power in battery usage slot datebase. 
Bug: 284893240
Test: manual
Change-Id: Ic09efabb0d93fb4bc7400b9410f32ec2f438dc73
 2023-09-08 20:20:36 +08:00
Angela Wang
bb1fe04afb Fix test failure of AvailableMediaDeviceGroupControllerTest 
Prevent test failing by avoid using ShadowFragment in the test. This
will cause `androidx.fragment.app.SuperNotCalledException` when creating
HearingAidPairingDialogFragment.

Bug: 299597695
Test: atest AvailableMediaDeviceGroupControllerTest
Change-Id: I99b5213cb78aad97fcb7e44e1babcf6c7f11636e
 2023-09-08 11:58:24 +00:00
Chaohui Wang
ce24ad65fe Merge "Fix some SettingsUITests" into main 2023-09-08 11:46:23 +00:00
Tetiana Meronyk
94b6aa45f7 Merge "Revert "Disable multiuser toggle when more than 1 user is created"" into main 2023-09-08 11:35:30 +00:00
Massimo Carli
e5ef38be3f Merge "Remove version text in user aspect ratio settings page" into main 2023-09-08 08:43:14 +00:00
Chaohui Wang
98ade3ae18 Merge "Clean up WifiDataUsageSummaryPreferenceController" into main 2023-09-08 08:03:18 +00:00
Chaohui Wang
1caab182a7 Fix some SettingsUITests 
Bug: 290381395
Test: atest AppsSettingsTests
Test: atest AppsSettingsRetainFilterTests
Test: atest AboutPhoneSettingsTests
Change-Id: I4c22afabbfc6ef5ed0e5fdcf86370ea0aaae5c74
 2023-09-08 15:48:29 +08:00
Chaohui Wang
81d99646e9 Set use_resource_processor for Settings tests 
Bug: 293810334
Test: unit test
Test: robo test
Change-Id: Ibc1756f4f1f943ee6aa8ebb4dda930684d93ae07
 2023-09-08 12:13:35 +08:00
Bill Yi
fde9937b04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours am: 120f89d40f -s ours am: e5042752a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07b1bf8ac6241dd786770594a02a2b472054cac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:28:29 +00:00
Bill Yi
6ecf38f8c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours am: c0e12c874e -s ours am: 98239c5485 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bda5257fb35d6cdcd9eef4cbc74c5975ef4e267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:28:22 +00:00
Bill Yi
dc2ace80f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours am: 610c2167bc -s ours am: a4b436ae78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I094718a7218375bed61f97d9042b6a93423e5c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:28:13 +00:00
Bill Yi
c936f4afd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours am: 18f139a3b8 -s ours am: 570569b43a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0bcacb50aa419373d97304eaae82acacdf02926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:28:03 +00:00
Bill Yi
1979b4ea1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours am: 97f0fa1142 -s ours am: 14d89bfce8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I583c3b25a6477ff48797adf5e8b0d64097ee0f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:27:53 +00:00
Colin Cross
9bd10befc9 [automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f53 -s ours am: c2c4d0855b -s ours 
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a is already in history

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

Change-Id: I8e011fa74e1ef800c65c5e44ea659cb6de7524ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:26:10 +00:00
Bill Yi
e5042752a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours am: 120f89d40f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78be937b26b283dfbe26956346f4bb7e179e0c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:48 +00:00
Bill Yi
98239c5485 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours am: c0e12c874e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3bb432203f06c3cd03c3f28f5193b16abc6b8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:40 +00:00
Bill Yi
a4b436ae78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours am: 610c2167bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie50c201a974840ff5d11b843c3b2f634879fe224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:28 +00:00
Bill Yi
570569b43a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours am: 18f139a3b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d6749a6812566ac286a99fcd80ccca2ca4b267d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:15 +00:00
Bill Yi
14d89bfce8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours am: 97f0fa1142 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I308d3e8482d0b85e70640096411826001f2a9e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:12 +00:00
Colin Cross
c2c4d0855b [automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f53 -s ours 
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a is already in history

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

Change-Id: I6b882af2fa940af95a2d9a23a9dc6926ab9b1d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:11:39 +00:00
Treehugger Robot
f9607c2b43 Merge "The new About > Account behavior" into main 2023-09-08 00:42:33 +00:00
Bill Yi
120f89d40f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcffc4bd7d291912a665a549f86d472feb5f4435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:35 +00:00
Bill Yi
c0e12c874e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffc5c4dab88234629757813c7ff679c3d6bcf27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:27 +00:00
Bill Yi
610c2167bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I270a554be450e56d18e46dd2e6f0f86e89ab0965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:15 +00:00
Bill Yi
18f139a3b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b1cb6160b47ba11735ea45444efecfe9160c218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:02 +00:00
Bill Yi
97f0fa1142 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0476264a7ec431fecb1a7dc47cdb3de4691bd068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:35:59 +00:00
Bill Yi
269d31645e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If070041457437f16845b2edc8c61516e60fab697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:52 +00:00
Bill Yi
ebfc5128ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ce07c057e0308c0fa6b40b74e368f64c8324f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:39 +00:00
Bill Yi
a4a56a7fb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a1ff34ef0b4f89c90a36ec50e5f1d2230d5202c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:32 +00:00
Bill Yi
c751e145d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I770162694316efb0427b657facf461c3b45800e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:21 +00:00
Bill Yi
8128682775 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37b04d6ebb72c2c2634892fb02908f81f115b95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:07 +00:00
Bill Yi
458e8cc311 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
3d0a8354b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
2527e8855f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-07 22:56:10 +00:00
Bill Yi
95ff1dbb5e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-07 22:56:10 +00:00