Commit Graph

135965 Commits

Author SHA1 Message Date
Yiyi Shen
f4e20cbfe0 Update the Fast Pair integration wording.
Bug: 296507968
Test: Manual
Change-Id: I9fedb998f71c82ab825e6701a0ac42058a7aac60
2023-09-13 18:03:29 +08:00
Zaiyue Xue
e3232dac25 Call detect anomaly in battery usage period job
Bug: 291689643
Bug: 284893240
Test: manual
Change-Id: I7015cdf5a96d518febb160934d780ae84fe14427
2023-09-13 17:49:14 +08:00
Graciela Putri
a727cea119 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4 am: f862ff58f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I0ba709c1187c099e5eccc9a4e0ab69d5559f9336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:54:57 +00:00
mxyyiyi
6b8daefd54 Impl highlight effect on BatteryChartView slots. am: 6750634259 am: 9e4fed1b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: I9a38284ab828c149ca06a51fbad7f3fcb2ac33de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:54:29 +00:00
Milton Wu
867df4287f [BiometricsV2] Ignore ui tests
Ignore biometricsV2 UI tests

Bug: 299892647
Bug: 299894420
Bug: 299892667
Bug: 299892703
Bug: 299898688
Test: atest FingerprintEnrollmentActivityTest
Change-Id: If7aa509dbc0943aa53ffcc9d118ecc19e59b127f
2023-09-13 08:37:44 +00:00
Graciela Putri
f862ff58f0 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:58:10 +00:00
mxyyiyi
9e4fed1b62 Impl highlight effect on BatteryChartView slots. am: 6750634259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: Iff96ebb33e50b2c2bddbe44eada5bf35f7118531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:57:45 +00:00
Manish Singh
5aef6b6264 Remove temp workaround for feature flag
Using the trunk stable feature flagging now.

Bug: 295516544
Test: m
Test: manual adb
Test: atest SafetySourceBroadcastReceiverTest
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I3d2d8c11dfb224ad2b09572493633366b4c4805c
2023-09-13 08:49:56 +01:00
Charlotte Lu
8ac60b5237 Add flag to change to the new APN page.
Fix: 300203760

Test: Visual
Change-Id: I0f869fb847f0a108487eb84509a736129fe42223
2023-09-13 07:15:35 +00:00
Graciela Putri
dd34fa54e4 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev 2023-09-13 07:14:13 +00:00
YK Hung
7f028b684c [automerger skipped] Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101 am: 9feaa3d883 -s ours
am skip reason: Merged-In Ib23b338fe3946e68ff73a372342ec5d86494c566 with SHA-1 f5ea50e20e is already in history

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

Change-Id: I760578371e55bc5ef8fe3291df20fe941026551a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 05:36:22 +00:00
YK Hung
0cb800a4d6 [automerger skipped] Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447 am: 8596b78a00 -s ours
am skip reason: Merged-In I826f517aa61e0c970048164706c4512ac3e0472d with SHA-1 2c0242bed3 is already in history

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

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

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

Change-Id: I2d7fd99406b999f5a027eefed61be22da293475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 05:30:51 +00:00
mxyyiyi
6750634259 Impl highlight effect on BatteryChartView slots.
Screenshot: https://screenshot.googleplex.com/F5VrGjj5kdNHMV6

Bug: 284893240
Bug: 291689623
Test: manual
Change-Id: I846d95d31e8bb839481b86a94d5191ff205f8328
2023-09-13 13:29:32 +08:00
YK Hung
9feaa3d883 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24545857

Change-Id: I29faff65657c84156d21d8e2bfc6ea285dbd5f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 04:45:21 +00:00
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