Commit Graph

42957 Commits

Author SHA1 Message Date
TreeHugger Robot
c8f45f75eb Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev
* changes:
  Bypass cancel error code during "Add another"
  Fix udfps fingerprint setting flow
  Use setting as base activity for fingerprint
  Use Mockito 4.6.1 FingerprintEnrollFindSensorTest
2022-08-30 00:22:53 +00:00
Xiaowen Lei
6a6374bc9b Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev 2022-08-29 16:32:40 +00:00
Milton Wu
af5a7d8dc0 Bypass cancel error code during "Add another"
1. When user chooses "Add another" on latest fingerprint enroll page, we
   shall bypass RESULT_CANCELED from FingerprintEnrollEnrolling. This is
   because user has successfully enrolled a fingerprint before enter
   FingerprintEnrollFinish page.

2. In FingerprintEnrollFindSensor
   A. Do not call startLookingForFingerprint() if mNextClick is true
      because it is wating the result back from
      FingerprintEnrollEnrolling, and let onActivityResult() mehtod to
      handle correct behavior.
   B. Add tests for following cases
      a. Sidecar existence
      b. Activity recycled and recreate in order to get activity result.

Bug: 243701933
Bug: 243762418

Test: ROBOTEST for SetupFingerprintEnrollFindSensorTest,
   FingerprintEnrollFindSensorTest, SetupFingerprintEnrollFinishTest

Test: Test scenarios w/ and w/o always_finish_activities
  1. Enroll a fingerprint but cancel it during enrolling in SuW
  2. Enroll a fingerprint in SuW
  3. Add another fingerprint in SuW
  4. Run "Add another" but cancel it during enrolling in SuW
  5. W/o enrolled fingerprint, add first fingerprint in settings
  6. W/o enrolled fingerprint, add first fingerprint but cancel it
     during enrolling in settings
  7. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" in settings
  8. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" then cancel it during enrolling in settings
  9. W/ 1 enrolled fingerprint, add fingerprint in settings
  10. W/ 1 enrolled fingerprint, add fingerprint but cancel it during
      enrolling in settings
  11. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" in settings
  12. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" then canel it during enrolling in settings

Change-Id: I03d8d8ebc39eb34f8fc28acb5cd267e37c7a0311
2022-08-29 07:22:45 +00:00
Milton Wu
d3a1f700ee Fix udfps fingerprint setting flow
1. on udfps + faceunlock devices, fingerprint settings shall not be
   launched if no fingerprint enrolled.
2. on udfps device, after first fingerprint enrollment successfully,
   fingerprint settings shall be shown.
3. Update FingerprintEnrollFindSensorTest to support udfps cases.

Bug: 243701933
Bug: 243003012
Test: manully adding first fingerprint on udfps + faceunlock device
Test: manully suw on udfps + faceunlock device
Test: run robotest for FingerprintEnrollFindSensorTest
      and SetupFingerprintEnrollFindSensorTest

Merged-In: I62d945f2c2e980edf2a885234e54acae109e7672
Change-Id: I62d945f2c2e980edf2a885234e54acae109e7672
(cherry picked from commit 936dd31312)
2022-08-29 07:22:40 +00:00
Milton Wu
561a68db20 Use setting as base activity for fingerprint
Change to use FingerprintSetting as base activity when use launch
"Fingerprint Unlock" from Settings -> Security. And then we can prevent
that necesssary pop-up activites become full-screen.

Bug: 243701933
Bug: 232874879

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest
Test: robo test for SetupFingerprintEnrollFindSensorTest
      SetupFingerprintEnrollFinishTest
      FingerprintEnrollFindSensorTest FingerprintEnrollEnrollingTest

Merged-In: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
Change-Id: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
(cherry picked from commit 84b39c3ed0)
2022-08-29 07:21:42 +00:00
Les Lee
b75858bf82 Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev 2022-08-29 01:38:58 +00:00
Kedar Chitnis
82a33ac452 Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev 2022-08-27 04:36:58 +00:00
Bonian Chen
d2644b4ea9 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev 2022-08-26 10:52:02 +00:00
Bonian Chen
9202260a42 [Settings] Not allow APN delete when adding is not an option
When not allowing APN to add, user may not be able to recover easily
when delete it.

Therefore, avoid from APN to be deleted when adding is not allowed.

Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:50:51 +00:00
TreeHugger Robot
6b5dc07b95 Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev 2022-08-26 05:36:37 +00:00
Zaiyue Xue
fb3ebf8dc7 Fix b/243746796 Crash when mouse hangs over an empty battery chart
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
Merged-In: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
2022-08-26 12:32:05 +08:00
TreeHugger Robot
9c39783771 Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev 2022-08-26 04:19:51 +00:00
Xiaowen Lei
3d41a009c8 Set page_id when logging ACTION_DREAM_SELECT_TYPE.
To differentiate from the same action logged on other pages.

Bug: 243553826
Test: on device via statsd_testdrive
Change-Id: If722e8ffa417aac11d92e7519d89bd459ddc5eeb
2022-08-25 23:48:36 +00:00
Menghan Li
b5ee432b4b Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev 2022-08-25 23:37:50 +00:00
Les Lee
c6c6ef3a58 wifi: Handle wifi ap initial state before register intent
The intent WIFI_AP_STATE_CHANGED_ACTION is not sticky intent after
SC-V2, query wifi ap state and run intent handling after registering intent.

Bug: 231214355
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Hotspot
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Tether
Test: Manual test, the state shows correctly even if resume hotspot settings page from recent app.
Change-Id: Iab6b2b8628d725b003d5e5c4086420a329611745
2022-08-25 23:07:40 +08:00
Zaiyue Xue
87db35205a Fix b/243485315: NullPointerException when getAppBatteryUsageData().
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
2022-08-25 13:36:44 +00:00
Tom Hsu
12377854b1 Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Tom Hsu
34cb6d3237 Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3 Merge "[Languages] Add new information to system language page." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Bill Lin
fd8e54e391 Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev 2022-08-25 04:36:14 +00:00
Chloris Kuo
6f79ffd831 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev 2022-08-24 22:37:58 +00:00
menghanli
66a96d220e Fix tapping magnification crash in vision settings setup screen
Root cause: ag/17286343 introduces hiding the settings entry in magnification settings if window magnification feature is not supported. It causes SuW page cannot find the settings preference reference.
Solution: Add null pointer check.

Bug: 242242266
Test: Manual testing
Change-Id: I1007a580047dd302228b28c15b82e958a2b01fec
(cherry picked from commit 5a87f6bbbf)
2022-08-24 21:17:46 +00:00
Chloris Kuo
54c677a83c Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.

Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
Merged-In: I6566cd9d615331a56728613583295637982bcd3f
2022-08-24 19:51:08 +00:00
Michael Wright
1218065085 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev 2022-08-24 15:24:15 +00:00
Lucas Silva
225b3b0640 Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev 2022-08-24 13:54:16 +00:00
lbill
7a4ddb8337 Set appropriate theme for SkipFingerprintDialog
The SkipFingerprintDialog is instantiation in
SetupFingerprintEnrollFindSensor#onSkipButtonClick()

Due to the call flow did not set appropriate theme
defined in setuplib for skip alertDialog instance
we set GlifV2ThemeAlertDialog AlertDialog.Builder.

Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      SetupFingerprintEnrollFindSensorTest
Test: manual factory reset, go through SUW, and check
      skip AlertDialog Bottom Bar Buttons visual.
Bug: 233243999
Change-Id: Ic198a23eb3e76d70e287b24f2ab1ef249b30b2fc
2022-08-24 13:45:21 +00:00
Michael Wright
475632c4fe Revert^3 "Improve App notification loading"
33710fd9e2

Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
2022-08-24 12:22:12 +00:00
Bonian Chen
6920c9e7ce Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev 2022-08-24 06:38:58 +00:00
Wesley Wang
a0c76c92a1 Merge "Update extra defend layout string" into tm-qpr-dev 2022-08-24 05:11:03 +00:00
YK Hung
821c5702cd Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev 2022-08-24 05:08:48 +00:00
TreeHugger Robot
adf79eae3e Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev 2022-08-24 05:04:05 +00:00
tom hsu
3aa4440b36 [Panlingual] Improve conditions of supporting app locale.
There are 3 conditions we need to check.
  1. Has locale config file
  2. Has locale config file w/o content
  3. Has locale config file w/ content

 Currently, we do not have condition 2 into the condition group, and we
 need to add it into.

Bug: b/243099750
Test: Manual
Change-Id: I58d0275af53031ba4f4c705022017d5143f45795
2022-08-24 03:39:35 +00:00
tom hsu
e6b46dc853 [Panlingual] Remove featureflag of app language.
Panlingual successfully landed. Hence, we can remove the feature flag
 right now.

Bug: b/209775925
Test: atest pass
Test: Manual test pass
Change-Id: I464a206027fd63ee1763acaf17d1b6251e839bc0
2022-08-24 11:29:31 +08:00
tom hsu
3cbb6f8680 [Languages] Add new information to system language page.
- Add top Intro preference
 - Add footer preference
 - Add sub string to language picker
 - Modify title of app locale pages

Bug: 242182598 Add information to system language page.
Bug: 241600418 [Panlingual] Change strings on App languages
Test: Maunal test
Change-Id: I9bca8911e8e70c97c273294b3c9d1d73d4ea0cb2
2022-08-24 11:04:24 +08:00
Betty Chang
f14071682f Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev 2022-08-24 02:55:13 +00:00
Bonian Chen
9bdca3ba92 [Settings] Data warning & limit UI should be configuable when running out of limit
Should access API which is irrelated to status of data limit.
Changing from API isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
into isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER).

Bug: 223361190
Change-Id: Iada89de38e9db3706a944c7a5b5f8a3e87d415e5
Test: Manual
(cherry picked from commit 7e530dda39)
2022-08-23 18:37:08 +00:00
Pajace Chen
b00140b7a3 Reduce the calling times for isExtraDefend
Only calling this HAL API when BatteryDefenderTips card need to be shown

Bug: 243465597
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Iae3c03d946ec29fe78a826ce62b6bebd893704ef
2022-08-23 20:15:50 +08:00
Zaiyue Xue
2a57f5de8d Port battery usage bug fixing cls from master to tm-qpr-dev
This cl is a merge of the following 5 cls:
ag/19674112	Fix b/242989581: The two battery charts have the same label
ag/19667114	Support data logging for battery usage new chart view
ag/19636171	Support data logging for battery usage new chart view
ag/19682758	Resolve insufficient contrast for system component icons
ag/19697763	Add fade in animation for battery usage chart group

Bug: 242989581
Bug: 242810430
Bug: 242989982
Test: presubmit
Change-Id: I39cd0f88ce62a280a966750082a40f8a537b9616
Merged-In: Ice30508bc20b5de631efee0db0160fe6ad710dbb
2022-08-23 19:30:49 +08:00
Bonian Chen
188ccde75b [Settings] Additional route for dismiss activity dialog
Previous design dismiss an activity dialog through Intent would lead to a pair of creating and finishing activity. The task switch during the creating and finishing may introduce some side effect to the other apps.

This change tried to add additional route to avoid from dismiss through Intent
but sending an async close request to that specific dialog (if available).

Bug: 236956105
Test: local, auto testing
Change-Id: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
2022-08-23 06:13:46 +00:00
Sayak Dutta
af11c676a9 Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev 2022-08-23 05:45:03 +00:00
changbetty
c918fa812b [LE Audio] Display the correct title on broadcast assistant device
Bug: 241509690
Test: manual test
Change-Id: Iaf3a54108faaa82354ca30656dd4b7a384806408
2022-08-23 03:01:42 +00:00
Diya Bera
02ca9bd23e Merge "Removed redundant face unlock option." into tm-qpr-dev 2022-08-22 21:57:44 +00:00
Joe Bolinger
aeb042d965 Merge "Cache context for generateChallenge response." into tm-qpr-dev 2022-08-22 21:04:40 +00:00
Lucas Silva
059154ebb2 Update dream complication settings to use boolean setting.
This simplifies the logic and prevents the boolean from toggling itself
when new complication types are added.

Bug: 241469874
Test: manually on device
Change-Id: I0b67f9f2ce75dcfc5e57a50f9b27e374ea9295b1
2022-08-22 16:22:53 -04:00
Michael Mikhail
c77ab55735 Merge "Add media on lock screen setting" into tm-qpr-dev 2022-08-22 14:46:06 +00:00
Julia Reynolds
635b3f065e Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev 2022-08-22 13:56:41 +00:00
wesleycwwang
27cbd5bccd Update extra defend layout string
Bug: 235246949
Test: make RunSettingsRoboTests
Change-Id: I3a3afe2e47d90882bdc4e4180ea5c6b079efd828
2022-08-22 18:51:45 +08:00
sayakiitg
9521748a77 Update back FooterButton visibility for navigation instead of back button
Bug: 201252175
Change-Id: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
(cherry picked from commit 40e436ff3b).
Merged-In: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
2022-08-22 06:31:38 +00:00
Sayak Dutta
e66ae3f9db Merge "Revamp SD card UX" into tm-qpr-dev 2022-08-22 06:13:30 +00:00
Kedar Chitnis
f4c320ae2f Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES
Bug b/214031645 has all IC reviews approved and the feature has been
merged and tested for more than 3 months. Hence removing the feature
flag.

Bug: 214031645
Test: SettingsTest, SystemUITests
Change-Id: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6
Merged-In: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6
2022-08-22 02:39:05 +00:00