Commit Graph

20060 Commits

Author SHA1 Message Date
Treehugger Robot
6a0adf823c Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a am: 5058935211
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935

Change-Id: Ia625b2356fa07e3264539f31c1239fea977b307f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 05:04:01 +00:00
YK Hung
f6a7b7c349 Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8 am: 5964c972fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476

Change-Id: If040bea85d7eb72805175f2585e1155100d5eb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 05:02:44 +00:00
Treehugger Robot
5058935211 Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935

Change-Id: Icda113c650b9544ae8218436fdd0a511f76d2aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:23:14 +00:00
YK Hung
5964c972fa Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476

Change-Id: I658e16b80d85c9e7022d57e8f960f11d5e5cd6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:21:53 +00:00
Treehugger Robot
103adb753a Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev 2023-08-02 03:26:19 +00:00
YK Hung
1b43697eb8 Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev 2023-08-02 03:23:11 +00:00
ykhung
69f46a72fc Update the incompatible charging banner tip icon
Update the incompatible banner tip icon based on the UX update:
https://screenshot.googleplex.com/8ApTNJnsxRRufjQ

Fix: 246960554
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I060554c17b3825b38004fb643c0a0cdf5fdbed4d
2023-08-02 02:05:15 +00:00
mxyyiyi
c4ac74872b Implement the battery tips cards.(1/2)
Bug: 291689623
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ff665bd3292986030fdd8a3689b35bbf6f5a615)
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 10:49:01 +00:00
Kuan Wang
64177774e2 Add cache strategy for getUsageSource().
Cache usage source into SharedPreferences when phone is booting to avoid
calling it too frequently.
It should be safe because the usage source can only change on reboot.

Bug: 293366011
Test: make RunSettingsRoboTests
Change-Id: I35c07539d294737c5764b03b746cfb39f4ce008d
2023-08-01 14:36:58 +08:00
Graciela Putri
677c476a2c Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev am: 1f1c2a7db9 am: c97131b90b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213103

Change-Id: I079c6d10edbba5635e095a29067f21e22945bf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:32:58 +00:00
Graciela Putri
9cba6cf4b9 Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906 am: e5e57a8d9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685

Change-Id: I0a880774214c804f2c22fb7aa876c39349e71b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:32:46 +00:00
YK Hung
d8f0731f60 Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad47 am: 4b1d5b8e8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24219784

Change-Id: I11be4dc1c925f0100183d842fe2d2b3a13ae2741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:21:21 +00:00
Graciela Putri
c97131b90b Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev am: 1f1c2a7db9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213103

Change-Id: Ie0f2338c707cc45dd1cbe57931102bf22df4184a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:24:45 +00:00
Graciela Putri
e5e57a8d9e Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685

Change-Id: I5f187502bc04d21629bdc1b434f74497f9def14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:21:45 +00:00
YK Hung
4b1d5b8e8e Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24219784

Change-Id: I866b3a26f917feb79371cb4d9ff5a086cdb16c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:08:22 +00:00
Graciela Putri
1f1c2a7db9 Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev 2023-07-28 13:15:52 +00:00
Graciela Putri
386b02e906 Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev 2023-07-28 13:14:03 +00:00
Graciela Wissen Putri
fa945cc808 [4/n] Add fullscreen option in user aspect ratio settings
Apps > App Info > Advanced > Aspect ratio

Adds fullscreen option to aspect ratio settings gated by fullscreen
build time and runtime flags. If fullscreen option is disabled, return
app default option.

To enable feature:
adb shell device_config put window_manager
enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 291900454
Test: All Settings CUJs passed
      atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I8f8d0c08ac81f088d6c25e8dfb3550f807f336b6
2023-07-28 10:09:56 +00:00
Graciela Wissen Putri
57984f02d5 [3/n] Add aspect ratio app info page
Apps > App Info > Advanced > Aspect ratio

Adds link from aspect ratio app list page to app info. Stops activity if
user chooses a different aspect ratio override.

To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 287448187
Test: Manual
      All Settings CUJs passed
      atest SettingsRoboTests:UserAspectRatioDetailsTest
      atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Id47f291459e62267bf15d629c163dde73d96928a
2023-07-28 09:53:11 +00:00
YK Hung
296322ad47 Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev 2023-07-28 05:53:16 +00:00
Treehugger Robot
98b806b999 Merge "Fix WifiScanWorkerTest tests failed" into main 2023-07-28 01:57:35 +00:00
Tyler Freeman
96e31c83a5 fix(bold text test): reset settings when test finishes
Fix: 293250385
Test: atest packages/apps/Settings/tests/unit/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
Change-Id: Ie1917799f9619157ce5e32997bd3798c68da085b
2023-07-27 09:04:44 -07:00
Weng Su
903d3e6409 Fix WifiScanWorkerTest tests failed
- @Mock WifiManager class for WifiTrackerLib

Bug: 292993539
Test: Manual test
make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.wifi.slice.WifiScanWorkerTest

Change-Id: I01758cf5043f6dc9b08bd06f4a72d9232b2ad8ed
2023-07-27 21:25:29 +08:00
Avinash Vadlamudi
0fe62fa541 Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed41e am: fea57771ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788

Change-Id: Icfb7379fab2fc973045c4cc381ae577468f1f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 11:42:35 +00:00
Avinash Vadlamudi
fea57771ad Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed41e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788

Change-Id: If440d5c2a6e65a760af7836b180e443c420a5991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 11:00:07 +00:00
ykhung
0610d2b682 Fix inconsistent connected without charging state in the Settings
Make the "connected, not charging" state condition is the same between
Settings main page (in the TopLevelBatteryPreferenceController), and
sub- battery settings page (in the BatteryHeaderPreferenceController).

https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java;l=116-119

Fix: 285204150
Test: make RunSettingsRoboTests -j40

Change-Id: I9b09d521ca71b18e180c779f1a048d1ea4ba161a
2023-07-27 08:21:49 +00:00
Treehugger Robot
6e43b13cb8 Merge "[BiometricsV2] Refine ErrorDialogViewModelTest" into main 2023-07-27 02:13:09 +00:00
Chris Antol
b95ceb53ba Merge "Storage Apps Lists SPA migration" into main 2023-07-26 19:00:40 +00:00
Avinash Vadlamudi
5567bdbfb3 Remove redundant code of setting the DeviceConfig overrides
- The auto pin confirm feature is now always available: (ag/23288037)

Bug: 291146670
Test: atest ChooseLockPasswordTest
Test: atest AutoPinConfirmPreferenceControllerTest
Change-Id: I6b9337dfee5d84ffdd3391f7b424377d640d451c
2023-07-26 17:51:13 +00:00
Treehugger Robot
35d8c4fcdf Merge "Disable FontWeightAdjustmentPreferenceControllerTest" into main 2023-07-26 13:18:28 +00:00
Adrian Roos
af4e91db85 Disable FontWeightAdjustmentPreferenceControllerTest
The test modifies the system-global font weight adjustment setting,
but doesn't reset it, leaving the system in a bad state for subsequent
tests.

Bug: 293250385
Change-Id: I9f7b8fc100b71181d17e5e72cc8c6d871c41de7d
Test: n/a

Bug: 293250385
Change-Id: I9f7b8fc100b71181d17e5e72cc8c6d871c41de7d
Test: n/a
2023-07-26 12:32:11 +00:00
Wenhui Yang
d1f2c04069 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d am: c7240489b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I04ec7f26fe4ce68d2083b6ce480735af4a22d6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 05:14:18 +00:00
Wenhui Yang
c7240489b0 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I015c68ff6531bb497e50ac2e21a4c11ba37394b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 04:24:43 +00:00
Wenhui Yang
b1feaf710d Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I1ed93893d170141ac974b2ad64fd2ddb6fe98bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 03:17:46 +00:00
Wenhui Yang
5239911c6b Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev 2023-07-26 02:44:08 +00:00
Chaohui Wang
a7a10f1088 Merge "Remove context from dashboardFeatureProvider" into main 2023-07-25 23:39:27 +00:00
Treehugger Robot
aefd2d6f36 Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea am: 8d6ff6d1b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: I03a3f349f725e6a6abdf53862400a42f39cb54e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 22:33:11 +00:00
Treehugger Robot
8d6ff6d1b6 Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: I7d8a257424acaf097339b062621eb85c515ae408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:52:38 +00:00
Treehugger Robot
57b00e28ea Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:59:46 +00:00
Wenhui Yang
d26f18f727 Revert "Fix rotate device at face unlock detailed page, device will display"
This reverts commit 2ca753bd06.

Reason for revert: Fix b/289173795

Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
2023-07-25 20:31:36 +00:00
Treehugger Robot
5a5184ab27 Merge "Fix test in RemoteVolumeGroupControllerTest" into main 2023-07-25 15:06:57 +00:00
Iván Budnik
dd6ee00476 Fix test in RemoteVolumeGroupControllerTest
The failure was caused by ag/24081083.

Bug: 292920056
Bug: 192657812
Test: atest RemoteVolumeGroupControllerTest
Change-Id: Iac59b69dd49b4873a72081ae5776fc2f451bbb10
2023-07-25 13:48:12 +00:00
Milton Wu
04b600d0d8 [BiometricsV2] Refine ErrorDialogViewModelTest
Some FingerprintEnrollErrorDialogViewModel APIs related coroutine don't
be well test in FingerprintEnrollErrorDialogViewModelTest

Bug: 293044262
Test: atest -m FingerprintEnrollErrorDialogViewModelTest
Change-Id: Iab3897d37c904184c1f58ab617e74cd563b3aa43
2023-07-25 13:02:02 +00:00
Bill Lin
41e2f9c1c0 Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2 am: f71d183d0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645

Change-Id: Ice5e79a72872009b5f1f90faf8bf9b02854c40d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 02:40:33 +00:00
Bill Lin
f71d183d0b Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645

Change-Id: If919e1da98abb430b7d6c79211139c6f2a1e4f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 01:57:48 +00:00
Bill Lin
c8eb80bcc2 Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev 2023-07-25 01:30:28 +00:00
lbill
a851e68272 Fix no vibration when enroll init stage after receive onEnrollmentHelp
Change the behavior of vibration when
1. Init stage, don't vibrate if onEnrollmentHelp invoke
2. Then next enroll progress update, should vibrate

Note: This onEnrollmentHelp is invoked by FINGERPRINT_ACQUIRED_PARTIAL

Test: Should vibration when the progress 1st indicating after lightly press
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 290723009
Change-Id: Ie056aac8b3251fb3da6dccd95254fb30628fa65e
2023-07-24 07:23:12 +00:00
Chris Antol
993e1cec1f Storage Apps Lists SPA migration
Pending task to support Sorting by Name which is currently not possible given existing SPA infra

Bug: 284032857
Bug: 284032898
Test: Unit Test. Uncomment lines and tested Settings>Storage>Apps and Settings>Storage>Games
Change-Id: I93853ed7184808a083b66ba5b03f9fe3acf48d41
2023-07-21 23:52:27 +00:00
Brandon Liu
da401305b0 Merge "Developer option for Grammatical Gender" into main 2023-07-21 23:39:26 +00:00
Graciela Putri
8dffd59e3d Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev am: 4e86d0d6b3 am: dc86dbe24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819684

Change-Id: If7c6f4fa26ea014e40e737f07daae8b72481e2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:58:58 +00:00