Commit Graph

19584 Commits

Author SHA1 Message Date
Wenhui Yang
b41875eff3 Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211335

Change-Id: Ie562c88a61db12214c11ee18361781f439abb12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 20:13:10 +00:00
Wenhui Yang
c2b7914778 Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev 2023-08-07 19:55:44 +00:00
Etan Cohen
a20cb88cf6 Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev am: dca9c6b88f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24285925

Change-Id: I687e5e85223d2b96d60667b1c203bd7264935cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 00:27:43 +00:00
Etan Cohen
dca9c6b88f Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev 2023-08-04 23:36:38 +00:00
Weng Su
cac69880ae Show policy transparency dialog for Wi-Fi network restrictions am: 28be567a83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156648

Change-Id: I5e5ebdc0aedc686e7a4257458d68592ea51c883b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:36:08 +00:00
Weng Su
28be567a83 Show policy transparency dialog for Wi-Fi network restrictions
- In order to support various user restrictions of individual Wi-Fi networks, WifiEntry provides the hasAdminRestrictions method for unified management.

- Settings will refer to WifiEntry#hasAdminRestrictions to restrict individual Wi-Fi networks.

Bug: 289448751
Bug: 289951241
Test: manual test
atest -c LongPressWifiEntryPreferenceTest

Change-Id: Iae5996a87ee72a3073300c7f62dfa14a9f31c21d
2023-08-04 07:18:28 +00:00
Justin McClain
e214825dfa Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057 am: 1f656a8734 am: d31a0c8d22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I3973e5f5ef8edc2747146024e5d77b7f6abb4b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 03:14:25 +00:00
Zoey Chen
2a2a50e4f2 Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev am: 9635d1cf45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24257533

Change-Id: I7f82cb95528fe96829f896ee5cb762ab401dd0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 02:54:30 +00:00
Justin McClain
d31a0c8d22 Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057 am: 1f656a8734
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I0ad2cbc29e05332110246c6eee41070461bb5f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 02:31:33 +00:00
Zoey Chen
9635d1cf45 Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev 2023-08-04 02:20:11 +00:00
Justin McClain
1f656a8734 Merge "Adding test directory owners file." into main am: e354820db7 am: b3c19b8057
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366

Change-Id: I9f74c2572c5fa47fb369679093bc5d6163169f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 01:43:57 +00:00
Etan Cohen
0fb1a3b3a7 Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces
Increase robustness of QR code parsing: while leading spaces aren't
expected (or allowed) they are observed in the wild and can be safely
ignored.

Bug: 292331368
Test: validated that QR code with scan is now parsed correctly
Test: atest WifiQrCodeTest
Change-Id: Ifff79870bea2ec9924f7b2e8100c2c01fd350846
2023-08-03 14:25:38 +00:00
Justin McClain
1b19dd472e Adding test directory owners file.
Test: m
Change-Id: Icbf936ab1b2da5269eb41c2c04001a6a6ff41a3a
2023-08-03 12:54:32 +00:00
Zoey Chen
1688c57226 [Regional Preference] Add description for checked/not checked
Bug: 288223637
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
Merged-In: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
2023-08-02 13:18:42 +00:00
YK Hung
42f0193b4b Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef18d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24124246

Change-Id: I657cab61453b5f7708fcf305d1a9611d3022c4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:26:29 +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
YK Hung
270b7ef18d Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev 2023-08-02 03:30:08 +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
Wenhui Yang
cf8ba456bb Add bp subtitle for WiFi sharing
Move the screen lock message selection logic to Utils and update the
related strings as suzannechen@ suggested.

Test: manual (see bug)
Test: atest UtilsTest
Fixes: 291307701
Change-Id: I346c25426395eea1320edc07ce2d962efeb8daa6
2023-08-01 21:11:33 +00:00
mxyyiyi
be8407c566 Implement the battery tips cards.(1/2)
- Implement a tips card UI in Battery Usage.

[Screenshot]:
- Tips Card with thumbs-up/down feedback in dark mode
https://screenshot.googleplex.com/3nRCFYvLTWfiYYT
- Tips Card without feedback
https://screenshot.googleplex.com/B7QGRJZAHzgWpCP
- Tips Card in Force RTL layout
https://screenshot.googleplex.com/8crQdj8ao26pKpH
- Tips Card in light mode
https://screenshot.googleplex.com/885aVvZm8xmhK2S

[TODO]:
- Add accessibility
- Localization

Bug: 291689623
Test: Manual
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
Merged-In: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 09:49:19 +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
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
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
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
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
16dc3ed748 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: I7292307f085c72568e2220a718268b487dd73345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 03:16:57 +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
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
731c2462bc 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: I699b21dd28e73c18945b4fecc6f3318b1cded128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:49:30 +00:00
Treehugger Robot
b48dfbbe86 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: Ia55ca6e477494e1e0ca3773c7a4df63ca2d59d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:04:58 +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
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
Graciela Putri
dc86dbe24b Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev am: 4e86d0d6b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819684

Change-Id: Iac8fc9b4d80e287a84e4a7d2917e76954ae64a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:13:34 +00:00
Graciela Putri
4e86d0d6b3 Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev 2023-07-21 21:28:44 +00:00