Commit Graph

50361 Commits

Author SHA1 Message Date
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
Cassie Wang
6dbba6d9e3 Merge "Add a config to show the Vpn options menu." into main 2023-07-26 02:23:40 +00:00
Treehugger Robot
d86ec6652a Merge "Correct used size of Storage Settings." into udc-d1-dev 2023-07-26 01:47:59 +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
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
Cassie Wang
75842520d2 Add a config to show the Vpn options menu.
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
2023-07-25 10:31:45 +09: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
Charlotte Lu
9d961b01ab Merge "Button text to turn off the sim" into main 2023-07-24 05:01:43 +00:00
Wenhui Yang
8dc0353e2e Update learn more string for udfps fp settings am: c6c9d74f06 am: eb94624bcd am: b43ac30381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: I56361c4b37674c2f6fe8cf9bdbd5a3f90b87f121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 02:20:18 +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
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
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
Vincent Wang
cd4b4f10cb Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev am: 11b9933fea am: 2b255a1f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074845

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

Change-Id: I8fba670669b04bf25fa1281c6daa1d3ec1ac9caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 04:03:16 +00: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
Treehugger Robot
4476db7365 Merge "Fix the Protocol buffer best practice warnings problem" into main 2023-07-20 17:29:33 +00:00
Michael Mikhail
1ff1626fd5 Merge "Override the state description of volume seekbar." into udc-qpr-dev am: 4b77d876b9 am: 31f420ce9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23985544

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

Change-Id: I8e970d59c04041f980d52861d229d2b0261d0ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:52:27 +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
122668a911 Merge "Show Instant Tether network icon" into udc-qpr-dev am: 8cdbeab57c am: 988568f64b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24122143

Change-Id: Ib363d47fc121b1f1c1c0f63f5f5d0906ae783607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:08:02 +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
Sunny Shao
4d00821093 Fix the Protocol buffer best practice warnings problem
- Add prefix for the items of the SessionType enums.

Fixes: 287363023
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: Ifde0b61a05b1257edaca54325a72dad333e43e3c
2023-07-20 21:48:22 +08: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
Treehugger Robot
facadb94c1 Merge "Remove duplicate routing logic from Settings app" into main 2023-07-20 10:06:33 +00:00
Charlotte Lu
51bf318f0e Button text to turn off the sim
Split the string Turn off before making the translate changes.
Create a new <string name="sim_action_turn_off">Turn off</string>.

Fix: 283736831
Test: Visual Test
Change-Id: I35ee1d57ac575f83d46be331c95e7435f1de6c5f
2023-07-20 17:59:31 +08: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