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

135038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Colin Cross
8f7a1e6f53 Fix kotlin nullable errors in Settings 
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
(cherry picked from commit 84f8961e67)
 2023-09-07 17:11:11 +00:00
Tetiana Meronyk
8489ae99dc Revert "Disable multiuser toggle when more than 1 user is created" 
Revert submission 24420426-multi_toggle

Reason for revert: This change needs to be done along with some other UI changes to avoid confusion

Reverted changes: /q/submissionid:24420426-multi_toggle

Change-Id: Ife2e03d0090fefcb4c1fa53dd007336759eb1bc7
 2023-09-07 15:50:09 +00:00
Bill Yi
0aee5a3e64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I07e5e02d38b78617cbe7f8a23053d0c15aedd692
 2023-09-07 04:18:01 -07:00
Bill Yi
0071351cfc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I79f55f0afe719e019225ea96a442a066ab33e4f3
 2023-09-07 04:15:45 -07:00
Bill Yi
219f3c68fa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18aa01b928c2e48302ed95acf15cdeec11c1c3e5
 2023-09-07 04:13:48 -07:00
Bill Yi
256fc161e2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic737190ddcd9f8d17a4551035ed2648aabb9a132
 2023-09-06 20:46:31 -07:00
Sunny Shao
b44fb93aa8 The new About > Account behavior 
- Change the display content of the summary while multiple accounts.
- Goto the Passwords & accounts page when users click Account item.

Fixes: 290593956
Test: atest BrandedAccountPreferenceControllerTest
Change-Id: Iae32803076d86455f52f2ffd278e06995161adfe
 2023-09-07 07:40:41 +08:00
Zaiyue Xue
c192039fe5 Merge "Refactor battery usage page contollers interaction logic" into main 2023-09-06 11:46:09 +00:00
Shivangi Dubey
25825c8329 Merge "Refine fold setting" into main 2023-09-06 10:47:31 +00:00
Zaiyue Xue
f5ea50e20e Refactor battery usage page contollers interaction logic 
(1) Move controllers interaction logic from BatteryChartPreferenceController to main page PowerUsageAdvanced.
(2) Move query power anomaly logic to DataProcessManager async job.

Bug: 284893240
Test: manual
Change-Id: Ib23b338fe3946e68ff73a372342ec5d86494c566
Merged-In: Ib23b338fe3946e68ff73a372342ec5d86494c566
 2023-09-06 17:51:02 +08:00
Chaohui Wang
4b686147b6 Clean up WifiDataUsageSummaryPreferenceController 
Which is legacy and not finished implemented.

Bug: 295260929
Test: unit test
Test: robo test
Test: manual - on Mobile Settings page
Test: manual - on Network details page
Change-Id: I30ac639c1ba285a74038d5413b63e2c31c6cc8ba
 2023-09-06 17:37:02 +08:00
Graciela Putri
9e571e55cf Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419 am: c8bd304d95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828

Change-Id: I3d5ad3abc86cf3bdb85c031bdee154708985176d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 04:10:27 +00:00
Graciela Putri
c8bd304d95 Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828

Change-Id: I336e6a719d50ab5bdc841d7e9bb68c6f60e040f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 03:19:38 +00:00
Graciela Putri
f7a443b419 Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev 2023-09-06 02:22:01 +00:00
Xinyi Mao
1d7a5e125b Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into main 2023-09-06 02:21:55 +00:00
Xin Li
56556078ad Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11 am: bc31bffab0 am: 21a77533a7 am: 4a46f2bc9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146

Change-Id: I7eabc9ed1a6f394a59f745a1547ef1b20c6f3a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:26:49 +00:00
Xin Li
4a46f2bc9b Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11 am: bc31bffab0 am: 21a77533a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146

Change-Id: I5e98258d795c64a3878d52c38e426f38a684d3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:07:25 +00:00
Xin Li
21a77533a7 Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11 am: bc31bffab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146

Change-Id: I9c3a850fbceb22d7e34601288d470eb4fd037723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:34:32 +00:00