Commit Graph

119302 Commits

Author SHA1 Message Date
TreeHugger Robot
0bebfe26f2 Merge "FingerprintEnrollmentActivity UI test" 2023-01-16 22:18:33 +00:00
Milton Wu
13d681f914 FingerprintEnrollmentActivity UI test
Add test cases in FingerprintEnrollmentActivity UI tests for
FindSensor fragments.

Bug: 260957816
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I1a256f09a1a5ebe43d6d563e62397f0dd2a1e4cb
2023-01-17 00:07:31 +08:00
Ankita Vyas
96e6398e52 Merge "AppClone: Add animation and description text in Cloned Apps page." 2023-01-16 09:37:40 +00:00
Tom Hsu
402e9cc532 Merge "Remove the unit test which has problem." 2023-01-16 09:22:54 +00:00
SongFerng Wang
0ceedc8d04 Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev am: f71b548285 am: 40838101dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20973543

Change-Id: I573b4835887ef22ed832291d881123690b9d5d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16 08:58:31 +00:00
SongFerng Wang
40838101dd Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev am: f71b548285
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20973543

Change-Id: Iff0e0f03886e414c36d508e5b17541514c1171f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16 08:21:26 +00:00
tom hsu
00bfd7e299 Remove the unit test which has problem.
Bug: b/265613591
Test: atest passed
Change-Id: I0df58e76171fdc49f405cb88d20469b0693f0041
2023-01-16 15:56:18 +08:00
SongFerng Wang
f71b548285 Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev 2023-01-16 07:44:37 +00:00
Kuan Wang
b427e8f02a Merge "Not show time information in battery optimization page when opened from Settings -> Apps" 2023-01-16 07:02:38 +00:00
Kuan Wang
1d58de3395 Merge "Add latest battery usage data when exporting battery usage data to EBS and Settings -> Apps" 2023-01-16 07:02:27 +00:00
Kuan Wang
96aee4896b Not show time information in battery optimization page when opened from
Settings -> Apps

Test: make RunSettingsRoboTests + manual
Bug: 265130434
Change-Id: Ie7ae6a97041f490e81adbe8e0c530799e09a7c66
2023-01-16 12:07:07 +08:00
TreeHugger Robot
bf386f73d3 Merge "Fix b/265409044: The battery usage page auto goes up when coming back from app details page." 2023-01-16 03:59:03 +00:00
Kuan Wang
54d7cd8a7a Add latest battery usage data when exporting battery usage data to EBS
and Settings -> Apps

Test: manual
Bug: 265130434
Change-Id: I1c6c1a831416d596b5bd71c6499f4c4672dbcdea
2023-01-16 11:44:53 +08:00
Angela Wang
a7999098e0 Merge "Hearing Aid Compatibility toggle functionality in Settings" 2023-01-16 02:56:28 +00:00
TreeHugger Robot
5575379610 Merge "Add FingerprintEnrollProgressViewModelTest" 2023-01-14 07:39:11 +00:00
Angela Wang
5640914420 Hearing Aid Compatibility toggle functionality in Settings
FCC has clarified that all smart phone must have a feature to enable Hearing Aid Compatibility (HAC) mode in system setting menu.

Currently the HAC settings is located in Dialer app's accessibility settings
page. We move this settings to Settings > Accessibility > Hearing Aids
page to compliance the rule.

Bug: 233976673
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidCompatibilityPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidsFragmentTest
Change-Id: Iba773456fd96b40ab3487a335c163079d083d505
2023-01-14 03:42:08 +00:00
Jason Chang
d2b71ce454 Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b1e am: 2cb8ea9496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727210

Change-Id: Ia1132d870dfb24900234f4a9ffc0d46b846e8584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 22:21:09 +00:00
Betty Chang
ee7b709aff Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6 am: c985a6d47d am: fb8a7a3b55
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: I3126d4c3a15ce813abb28c2bf6ce38394f5aa570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 21:59:35 +00:00
Xin Li
4b5a5a4ca5 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5482fb0301 -s ours am: 8fddc2a74a -s ours
am skip reason: Merged-In Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0 with SHA-1 2681d8cc05 is already in history

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

Change-Id: I9f70e7407641fb71edf08f2b102099c703f4d703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 21:35:25 +00:00
TreeHugger Robot
1e7401401d Merge "[Regional Preference] Remove unit tes tof systemproperty" 2023-01-13 14:30:02 +00:00
tom hsu
7b0c8cfb53 [Regional Preference] Remove unit tes tof systemproperty
- Unit test of System Property failed due to timing issue. Remove it to avoid to impact formal unit test tracker.

 - This system property is feature flag.

Bug: b/265410669
Test: atest passed.
Change-Id: I65b4a34e1a362428ccb18611c90702650a5cdf8f
2023-01-13 13:15:06 +00:00
Jason Chang
2cb8ea9496 Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727210

Change-Id: I0ad6727e5056a11d72714aec5dff289458c1f855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 13:07:37 +00:00
Zaiyue Xue
7627a0e575 Fix b/265409044: The battery usage page auto goes up when coming back from app details page.
screen record after fix: https://drive.google.com/file/d/1a2vvMIYLSalXfM8-004drKBWK2LcK_F9/view?resourcekey=0-A586Sk0yx-OnErHkd5EgjQ

Bug: 265409044
Fix: 265409044
Test: manual
Change-Id: I7a58c9081250936de27a4970d0a9708168138fb9
2023-01-13 20:41:26 +08:00
Betty Chang
fb8a7a3b55 Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6 am: c985a6d47d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: Ia5d97a91a9a52b044b7d016b80b67cf094d45acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 12:32:42 +00:00
Jason Chang
bfa35a7b1e Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev 2023-01-13 12:31:40 +00:00
Betty Chang
c985a6d47d Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 11:58:35 +00:00
Jason Chang
8c5bcaa374 (2/2) Fix settings face enrollment UI layout problem
To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button

Bug: 260653042
Bug: 263065347

Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"

Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
2023-01-13 10:48:50 +00:00
Betty Chang
d7e16c22f6 Merge "[LE Audio] To add the vibrate when the scan is successful" 2023-01-13 10:34:12 +00:00
TreeHugger Robot
30317dd2b9 Merge "Query usage event for a longer time period and then trim the usage events outside the expected period to make sure the app usage calculation near the boundaries are correct." 2023-01-13 08:36:24 +00:00
Ankita Vyas
7bad1241a4 AppClone: Add animation and description text in Cloned Apps page.
Bug: 265251138
Test: manual and robo
Change-Id: I623c01fc74c1ac162917fce8b2fda9754b0a2b4b
2023-01-13 08:12:18 +00:00
Xin Li
8fddc2a74a [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5482fb0301 -s ours
am skip reason: Merged-In Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0 with SHA-1 2681d8cc05 is already in history

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

Change-Id: Iffc03515779701859b256b2b5384612eaa45a63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 08:08:01 +00:00
Kuan Wang
4a6b26558d Query usage event for a longer time period and then trim the usage
events outside the expected period to make sure the app usage calculation near the boundaries are correct.

Test: make RunSettingsRoboTests + manual
Bug: 264858898
Change-Id: I9f6aa5a09a537f48a26a08b7dff8ae81e8a16e2a
2023-01-13 15:17:27 +08:00
TreeHugger Robot
eac5326a16 Merge "Add toggle for Wi-Fi hotspot" 2023-01-13 06:25:47 +00:00
SongFerng Wang
fe5978cde1 Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"
This reverts commit 078ecbd765.

Reason for revert: The in-market device have error by some unknown reasons at b/264371574. To revert it, then the settings wait the 25s, it can protect the system has enough time for enabling esim.

Change-Id: Ic17380f549c764306851ad5cba6360f68df9b9b5
2023-01-13 04:18:34 +00:00
Milton Wu
af880ef718 Add FingerprintEnrollProgressViewModelTest
Bug: 259664912
Test: m RunSettingsRoboTests
      ROBOTEST_FILTER=FingerprintEnrollProgressViewModelTest
Change-Id: I10605a9f179c20c3a1ba23373485855a0cbb7099
2023-01-13 11:57:59 +08:00
TreeHugger Robot
8fce459806 Merge "Fix settings crash" 2023-01-13 02:51:11 +00:00
changbetty
ca475a5d37 [LE Audio] To add the vibrate when the scan is successful
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
2023-01-13 02:30:23 +00:00
Jing Ji
c29bd1cdc1 Merge "Add a feature flag for the special access to the long background task" 2023-01-13 01:10:15 +00:00
TreeHugger Robot
66394f56e2 Merge "Fix checkcolor_hook error" 2023-01-13 01:02:41 +00:00
Weng Su
f779e6c9d3 Add toggle for Wi-Fi hotspot
- Add Wi-Fi hotspot toggle with vertical divider

- Disable preference and toggle when Data Saver is enabled

Bug: 245569117
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
atest -c TetheringManagerModelTest

Change-Id: Ic2baf7d3d0a7bf9527da38d24ecc511b7c91265a
2023-01-13 08:52:54 +08:00
Diya Bera
38ad4e2a07 Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae am: fd252fff94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301

Change-Id: I5281b559589fcd6fdeaea49a256af4b6eea8936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 21:15:29 +00:00
Diya Bera
fd252fff94 Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301

Change-Id: I9edcd73ab9f7ab08d1f4305ecda92090171b140a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 20:03:22 +00:00
Mady Mellor
1ddb83a8cb Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032 am: 599d990913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: I2065ec218f8fa9d4c83abad8a18f1d011e24d61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 19:58:19 +00:00
Diya Bera
6c703e12ae Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev 2023-01-12 19:30:05 +00:00
Mady Mellor
599d990913 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: Ie1a6ecdc7b6a896c5839bda765a3e2ad359dd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 18:49:52 +00:00
Mady Mellor
912ace3032 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev 2023-01-12 18:16:04 +00:00
Becca Hughes
e1608b369f Fix settings crash
Fix settings crash when dialog is shown
becuase the wrong fragment manager is
used.

Bug: 264939770
Test: unit test and test on device
Change-Id: I5f4c04740058baaa1c96a7108dc4b08b3e467fb8
2023-01-12 18:10:24 +00:00
Kevin Liu
b37f8bf1b1 [automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: 521278a00d am: 2d0ad56211 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history

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

Change-Id: Ifa0094671af47968f9ba98c78812b9be423cf0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 17:20:47 +00:00
Automerger Merge Worker
0913e13c00 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9dc317eea -s ours" 2023-01-12 17:18:41 +00:00
Behnam Heydarshahi
74f725254e Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 am: 93ae531273
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Ifc2e24c703199737d647f55f8615d83795630477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 17:18:05 +00:00