Commit Graph

49579 Commits

Author SHA1 Message Date
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
Treehugger Robot
26579447e5 Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev am: fd956769c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199981

Change-Id: Ica5220033baeda6812f4cbbe2f2ef442d0bd1645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:05:34 +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
fd956769c1 Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev 2023-07-28 00:03:28 +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
Tetiana Meronyk
414c82a2f2 Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcde2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129

Change-Id: I111635a0c02a4a37e4a2f1bfe0ecaf0067a1703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:11:04 +00:00
Tetiana Meronyk
98df5bcde2 Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev 2023-07-26 16:47:18 +00:00
Treehugger Robot
4405824d2c Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ibd736933f8d0aa649930a1d432611b958d09f292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 07:19:20 +00:00
Treehugger Robot
ff78df4b72 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ie247ffcc6ec787912e50474ec1d51744e6dfc5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 06:38:47 +00:00
Treehugger Robot
3d47657593 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 05:31:45 +00:00
Treehugger Robot
9a44907d9e Merge "Match APN types with ignoring the case" into main am: 720fd136ed
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: I502a8c1c156c26bb68f73afc4a2c5d438aef5dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 04:47:15 +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
4f21f99c6d Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724

Change-Id: I837d4842ba1031e5270d54af8b29955ead10fb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 02:07:33 +00:00
Treehugger Robot
d86ec6652a Merge "Correct used size of Storage Settings." into udc-d1-dev 2023-07-26 01:47:59 +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
Darrell Shi
909f94b005 Update WhenToDreamPicker to unique page id
Bug: 260071554
Fix: 260071554
Test: manual
Change-Id: I4c0bea83575ec0449b7570a9d854f5d76c845f95
2023-07-25 22:07:50 +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
Tetiana Meronyk
6b27c08150 Fix keyboard showing after dialog dismissed
When dialog for creating user was dismissed with keyboard being displayed, the keyboard stayed on the screen and could not be released due to incorrect list of methods called on dialog dismissal. This CL topic fixes onDismiss() behaviour of this dialog. Videos of current behaviour and behaviour after fixed are attached to the bug.

Bug: 291865725
Test: atest UserSettingsTest
Change-Id: Ib3ade3de9228c8ba24e7ac2e235aaeec45efbe4e
2023-07-24 10:30:32 +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
Wenhui Yang
b43ac30381 Update learn more string for udfps fp settings am: c6c9d74f06 am: eb94624bcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: Ibbdff74d2be55f961a9f91bcdc1f1278dc2bbaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 01:37:57 +00:00
Wenhui Yang
8b29400717 Update learn more string for udfps fp settings am: c6c9d74f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: Ia0c854ca05bd17b4cd25d100010d831cc3052afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 00:53:10 +00:00
Wenhui Yang
eb94624bcd Update learn more string for udfps fp settings am: c6c9d74f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: I92bc5389ab6346cbedcce6e76135067ec3a201a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 00:51:46 +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
Graciela Wissen Putri
b4c4f6cbe6 [2/n] Add aspect ratio app list page under apps
Apps > General > Screen Size

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

Fix: 287448088
Test: Manual
      atest AspectRatioAppsPageProviderTest
      atest AspectRatioUtilsTest
      All CUJs passed in go/settings-cujs
Change-Id: I4de6c3cbdbdfbc79ed839ec149fb633344dcd3a7
2023-07-21 08:02:09 +00:00
Hideki Ishii
8bce735fa0 Match APN types with ignoring the case
Currently APN types which are set on ApnEditor are compared with the
types which are configured with read_only_apn_types_string_array in a
case-sensitive manner. So upper case types such as "DUN" or "IMS" can be
set if read_only_apn_types_string_array is configured as "dun" or "ims."
Then the APN with types such as "DUN" or "IMS" can be added and may be
used for the network connection unintentionally.

This patch compares APN types with ignoring the case on ApnEditor to
prevent the problem above.

Bug: 200194310
Test: Manual test passed
Change-Id: I0f68bf470699df388855ec7277c0cfc24a2c30ba
2023-07-21 15:49:02 +09:00
Vincent Wang
2b255a1f3a Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev am: 11b9933fea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074845

Change-Id: I8bf87b0e453cfb9c7fbed3da1fa51902adc2f32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 03:43:49 +00:00
Vincent Wang
11b9933fea Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev 2023-07-21 03:32:32 +00:00
Angela Wang
2768bbd241 Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev am: 8a373a5b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659918

Change-Id: I705310a82badd1b9a389fe78402db607b669ffff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 03:25:14 +00:00
Angela Wang
2ca0e6cb40 Merge "Scan LE audio hearing aids in HearingDevicePairingDetail" into udc-qpr-dev am: b598284c68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726371

Change-Id: I4c4fcf33c3b64497ea5bc741ec4b8c839e9466cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 03:22:21 +00:00
Angela Wang
8a373a5b14 Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev 2023-07-21 02:39:10 +00:00
Angela Wang
b598284c68 Merge "Scan LE audio hearing aids in HearingDevicePairingDetail" into udc-qpr-dev 2023-07-21 02:38:24 +00:00
Wenhui Yang
c6c9d74f06 Update learn more string for udfps fp settings
Update the learn more message for udfps fingerprint unlock to make it
consistent with sdfps.

Fixes: 289167628
Test: manual (see bug)
Change-Id: Iac6edb1c176dab462c91e1bf6236dfe4d0988693
2023-07-21 02:36:24 +00:00
Michael Mikhail
31f420ce9b Merge "Override the state description of volume seekbar." into udc-qpr-dev am: 4b77d876b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23985544

Change-Id: I4e0cceb56a32df85b18179fe9fb08e1bc49f2884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:27:17 +00:00
Vania Januar
3a67c3e17f Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev am: bbf2dc4991
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23221022

Change-Id: Ied0222e7235e2643553e7401ac9b4c0ece442cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:22:47 +00:00
SongFerng Wang
a4cac90c1d Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev am: a94cfc7b76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24098950

Change-Id: Iba6b9d6b453c7e0289fd4ad81391483084fab0e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:21:01 +00:00
Weng Su
988568f64b Merge "Show Instant Tether network icon" into udc-qpr-dev am: 8cdbeab57c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24122143

Change-Id: If84ef910cfd4f0af6f34007c73c2cb50a91ea40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 15:50:37 +00:00
Michael Mikhail
4b77d876b9 Merge "Override the state description of volume seekbar." into udc-qpr-dev 2023-07-20 15:32:28 +00:00
Michael Mikhail
b222b96407 Override the state description of volume seekbar.
This overrides the state description of seekbar in order to adjust the
progress percentage. The percentage of seekbar is not matching with the
percentage said by talkback feature when the volume changes. This CL
rounds the percentage to match what is said by talkback.

Bug: 285458191
Test: Enabled talkback and checked percentages of sliders of all sounds
and vibrations volumes. Video attached in bug link.
Test: atest VolumeSeekBarPreferenceTest.

Change-Id: Iedcf3eccb13b7f8ee1a4ca521f0783c55d7a1902
2023-07-20 14:11:26 +00:00
Vania Januar
bbf2dc4991 Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev 2023-07-20 13:42:55 +00:00
SongFerng Wang
a94cfc7b76 Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev 2023-07-20 04:55:04 +00:00