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

135692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
8596b78a00 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24663389

Change-Id: I89aa04fe2079243e78328177069bb16c1e8e5297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:43:40 +00:00
YK Hung
348b3b91d8 Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev am: 378ad24aac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24673967

Change-Id: I06b8e72ab87c673ffde51cfbc4a93327a770f4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:39:58 +00:00
Treehugger Robot
aab57c0179 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24689853

Change-Id: I6aa86815837a7be5fc76273a121c4060a12f5b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:39:21 +00:00
YK Hung
9a293a7101 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev 2023-09-13 04:35:26 +00:00
YK Hung
02b5491447 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev 2023-09-13 04:35:16 +00:00
YK Hung
378ad24aac Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev 2023-09-13 04:24:04 +00:00
Treehugger Robot
7e92664f52 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev 2023-09-13 04:11:20 +00:00
Zaiyue Xue
ea0f5b3d45 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-13 03:56:28 +00:00
Hao Dong
0978271198 Remove FingerprintStateViewModel. 
Since FingerprintStateViewModel is too general as a view model, this CL
removes it and adds more concrete flows in FingerprintSettingsViewModel
and FingerprintEnrollViewModel.

Test: atest FingerprintManagerInteractorTest
Test: atest FingerprintSettingsViewModelTest
Test: Verified enroll/deletion/renaming/authentication flows on Settings

Change-Id: I3a0662195c4989de0813b92bccda9d36a7f7e32a
 2023-09-12 23:17:46 +00:00
Colin Cross
4fda9e8e42 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -s ours am: b66a576c96 -s ours am: aa33b6586f -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/+/24724914

Change-Id: I6df44d9edad8204becf5a58ad73d56045b4106a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 22:55:42 +00:00
Colin Cross
19214157d3 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours am: b50a062c94 -s ours am: 3f8c8ba9d8 -s ours am: f181b570f4 -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/+/24724914

Change-Id: I31422b1238f7b4b39320eb25519f51338d24abe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 22:55:27 +00:00
Hao Dong
f75d044a90 Merge "Add dependency on BiometricsSharedLib." into main 2023-09-12 21:32:02 +00:00
Colin Cross
aa33b6586f [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -s ours am: b66a576c96 -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/+/24724914

Change-Id: Icabd57883035dffe81a2b10d8877f7c6f49ad999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 21:05:49 +00:00
Colin Cross
f181b570f4 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours am: b50a062c94 -s ours am: 3f8c8ba9d8 -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/+/24724914

Change-Id: I648ef6d76dce26c33f26e55cbe8c36ad0d0f3188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 21:05:36 +00:00
Colin Cross
b66a576c96 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -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/+/24724914

Change-Id: If4e4528144c582186b92ad5c75a71175f7d6edd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 20:27:08 +00:00
Colin Cross
3f8c8ba9d8 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours am: b50a062c94 -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/+/24724914

Change-Id: I4bc4adb35e15b172dd7e27b74eabb9c27006f23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 20:26:53 +00:00
Becca Hughes
dc5e10e3cc Add a couple of guards to make sure crash doesn't happen 
This adds two guards, first checking when the provider
list is generated to stop and flag an warning, second
to have PackageMonitor use a handler so callbacks should
only happen on the thread that the fragment is running
on and if that is no longer available it won't do
anything.

Test: ondevice
Bug: 296164461
Change-Id: Iab03f8a10e667694e2e23da7574831f9ea5c38e2
 2023-09-12 19:45:50 +00:00
Colin Cross
7076317476 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -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/+/24724914

Change-Id: I9591d9d58c2a862c21c6f2dff6cb3ced1c3a7fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 19:41:29 +00:00
Colin Cross
b50a062c94 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -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/+/24724914

Change-Id: I60ccd1753ff043480a12c9e876a4241a73729c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 19:41:14 +00:00
Yuanru Qian
369b3f3ef9 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 am: ea691aca93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: Ia0fa5945c13561d2d43f01ea05e8dee420adfcac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 18:43:09 +00:00
Colin Cross
f87c5f2cfc Merge "Fix kotlin nullable errors in Settings" into aosp-main-future 2023-09-12 18:36:47 +00:00
Guojing Yuan
756d23cad1 [CDM] Add Permissions Sync toggle 
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
 2023-09-12 18:02:38 +00:00
Yuanru Qian
ea691aca93 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I1a0c3b36915a42588aafdeaa41eca6fd57889350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 17:43:15 +00:00
Yuanru Qian
22a947a156 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 17:04:28 +00:00
Graciela Wissen Putri
c37c8b8789 Change aspect ratio summary and footer text 
Add more education for device user that setting aspect ratio has not
been tested by the app developer. Move Aspect ratio under Apps >
Advanced instead of General.

Fix: 296160724
Test: atest UserAspectRatioAppsPageProviderTest
Change-Id: I2078f285d7bfb8de3a61c69f9d0ff3872d683ed4
 2023-09-12 16:56:10 +00:00
Yuanru Qian
945b20c70d Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: If6e8d7182b4c6feaca4da62052442f46f930b227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 16:14:39 +00:00
Chaohui Wang
5d8fea06b1 Remove ExperimentalLifecycleComposeApi 
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f0641)
(cherry picked from commit 2910d68343)
(cherry picked from commit f1febf9e9b)
 2023-09-12 15:30:57 +00:00
Yuanru Qian
81343f23fc Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 15:21:52 +00:00
Yuanru Qian
9ace1904c3 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main 2023-09-12 14:37:23 +00:00
Massimo Carli
e3c53f39a3 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 am: 7d297719d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I75fbcbb10b149bc16b2deead7645df992572e7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 12:11:47 +00:00
mxyyiyi
19046965da Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2) 
- Remove unused flag is_battery_tips_feedback_enabled
- Update logic about is_battery_tips_enabled

Bug: 284893240
Bug: 291689623
Test: Manual
Change-Id: I826f517aa61e0c970048164706c4512ac3e0472d
Merged-In: I826f517aa61e0c970048164706c4512ac3e0472d
 2023-09-12 11:28:10 +00:00
Massimo Carli
7d297719d7 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I8e95d9e9704649cbcb3eed980e3d0275116b4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 11:16:24 +00:00
Massimo Carli
951bbde355 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev 2023-09-12 10:09:19 +00:00
Yuanru Qian
8ffc3c728d Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS 
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
 2023-09-12 07:39:43 +00:00
Massimo Carli
24aa9c8f15 Changed app string changes in user aspect ratio settings 
Bug: 297288214
Test: Manual

Change-Id: I72c0b53d8d9db92b12d4e9507fcf40b1be76d745
 2023-09-12 06:29:19 +00:00
YK Hung
f5a01823b1 Merge "Centralise time to full in SettingsLib" into main 2023-09-12 06:15:04 +00:00
Angela Wang
d84c60f2ac Merge "Fix test failure of AvailableMediaDeviceGroupControllerTest" into main 2023-09-12 06:06:08 +00:00
Zaiyue Xue
13695adf07 Recheck the scedule job when the device is full charged and add more logs 
Bug: 298539147
Fix: 298539147
Test: manual
Change-Id: Id9fdba17b24cbc6558bc29576f8cd93782854ee4
 2023-09-12 13:44:19 +08:00
Chaohui Wang
5bf2981d08 Fix SettingsUITests flakiness 
Bug: 290684887
Test: atest SettingsUITests
Change-Id: I8f85c9c50eb3426b740c7ef3bf8996d6655bca0a
 2023-09-12 11:44:50 +08:00
Colin Cross
ee87a406cd 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:753c96133a1aa9e7b6dd63fa36816d171fec0f22)
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
 2023-09-11 22:30:58 +00:00
randypfohl
aeb3bd3df5 update navigation mode settings string 
Test: built locally, verified with screenshot

Bug:293110731

Change-Id: I4c57eca43c6f4ce8ede515ee52096e4449d88b2b
 2023-09-11 12:24:47 -07:00
Hao Dong
6b58dad5b5 Add dependency on BiometricsSharedLib. 
Test: N/A

Change-Id: Icbd4df8e5bca638f385fa040496902797f38fdec
 2023-09-11 19:00:14 +00:00
Eric Rahm
860fce72ec Merge "Revert "Test Fix SettingRobolectricTest Fail"" into main 2023-09-11 17:56:16 +00:00
Becca Hughes
72dc40e42e Only update settings UI if data changes 
The flashing was caused by overzealous
reloading which should be fixed by this
CL.

Test: flash device
Bug: 299329723
Change-Id: I7d97da7f3c699ebea280a337bc64b8fe2f351126
 2023-09-11 16:44:16 +00:00
Eric Rahm
802b922593 Revert "Test Fix SettingRobolectricTest Fail" 
This reverts commit 818f77cd1f.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
 2023-09-11 13:38:36 +00:00
Manish Singh
7cd9300c1d Merge "Add Private Space settings page" into main 2023-09-11 12:52:05 +00:00
Trina
bb21c0e1b7 Centralise time to full in SettingsLib 
Test: atest SystemUIGoogleTests

Bug: 275679195
Change-Id: Ie4ca699e73e4ec48f2b0b8d95e61d0bd103f5e37
 2023-09-11 11:16:58 +00:00
Chaohui Wang
e2e0af282a Add DevelopmentSettingsTest 
Bug: 290684887
Test: atest SettingsUITests
Change-Id: I3acda74c96679fcdb531990848e456d5da0ae239
 2023-09-11 16:10:22 +08:00
Chaohui Wang
a35c6bc139 Fix more SettingsUITests 
Also add SettingsUITests to postsubmit.

Bug: 290381395
Test: ui test
Change-Id: Ib1dd35bf7823290bf77deb31366e9cb6ae9f65f7
 2023-09-09 22:02:56 +08:00
Massimo Carli
f1a1439d2b [automerger skipped] Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6 am: de41256dd2 -s ours 
am skip reason: Merged-In Iaf757715e60ab4ff2356ee0c89bc2129948a6c08 with SHA-1 eb7eee658b is already in history

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

Change-Id: I449ee24dcf5072178b6d35ff57a1010c287cac60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-09 00:42:19 +00:00