Commit Graph

14427 Commits

Author SHA1 Message Date
Omer Osman
5d78a3aac6 Merge "Update Opus over A2DP to use BluetoothCodecConfig api" 2022-08-30 16:19:27 +00:00
Bill Lin
7ab0629412 Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f am: 2db995725b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: I71ec6e696bc2a145c1deffdc76404bcaa2f58a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 12:54:19 +00:00
Bill Lin
2db995725b Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: If2c57ce270318368690eba8ed6680ab20f3dd260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 12:24:51 +00:00
Bill Lin
7d15cb501f Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev 2022-08-30 12:06:47 +00:00
Daniel Huang
7505e97ce9 Merge "Separate "Keyboard" from "Language & input"" 2022-08-30 08:20:14 +00:00
danielwbhuang
c9cb6806f6 Separate "Keyboard" from "Language & input"
1. Separate "Keyboard" from "Language & input".
2. Use FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI to control the
   different UI until Settings launches the new UI design.

Bug: 242680328
Test: local test
Change-Id: Id1ea6d3e3c2e6b83bc4b4d835c6b27e31311c530
2022-08-30 14:22:05 +08:00
TreeHugger Robot
196f517c75 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb am: a585bebcc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: Ibe3607cfaaf8b91c8ab6beccc6d305e8edcb7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:23:59 +00:00
TreeHugger Robot
a585bebcc8 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: I3b0053910613af42ecc91b8a416b131c662c1837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:37 +00:00
Milton Wu
7856ab058d Fix udfps fingerprint setting flow am: d3a1f700ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732077

Change-Id: Ib1e8d3aa448dca12b656bb4e0fcb3a3e85c394ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:35 +00:00
Milton Wu
84c9a6308f Use setting as base activity for fingerprint am: 561a68db20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732076

Change-Id: I84e533045cb9043e71634400081d02d2f04faf44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:34 +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
Milton Wu
e167286a37 Use Mockito 4.6.1 FingerprintEnrollFindSensorTest
Due to java import has been changed in downstream, update import part to
use Mockito 4.6.1 inside FingerprintEnrollFindSensorTest to prevent
downstream merge conflict.

Bug: 243701933
Test: roboTests FingerprintEnrollFindSensorTest
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
Change-Id: Idbf7852d95b248293909f73a0cce69de166931c9
2022-08-29 06:44:32 +00:00
TreeHugger Robot
66a56fdd37 Merge "Remove duplicate strings." 2022-08-26 17:52:54 +00:00
Bonian Chen
06664b8c37 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9 am: 90a36213bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248

Change-Id: Ibf866ba9ee70e2ada74c283f5e079d2136a61173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 11:36:54 +00:00
Bonian Chen
90a36213bb Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248

Change-Id: Id550ed73ab4e6dd7c01504eaf315de23598aff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 11:17:02 +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
lbill
e944661955 Cancel UDFPS enrollment on overlay focus loss
Integrate onWindowFocusChanged() to FingerprintEnrollEnrolling
When the activity window lost focus, we just cancel this enroll
session, and create a dialog to notify user.

* Keep legacy rotation behavior, do not cancel enrollment if user
  rotate device.
* This change will cancel enrollment when user interrupted by
  1) Swipe down Notification Shade
  2) Heads up notification expand
  3) Bubble Expanded
  4) Google Assist
  5) PIP expand
  6) Recents
  7) Launch Power Menu(Global Action)

Test: manual test above scenario
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 228261883
Bug: 242478941
Bug: 227905887
Change-Id: Id097e6b15928646cd5ab91c2a1f6eb1bb9bf190b
2022-08-26 01:30:33 +00:00
Kweku Adams
5949fccc7a Remove duplicate strings.
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
2022-08-26 00:07:08 +00:00
Bill Lin
1e60f829e9 Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391 am: ac4f84f05d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587

Change-Id: I1d714e27beaa1f3ac5bccd45e5c11663d2fcba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 06:10:59 +00:00
Bill Lin
ac4f84f05d Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587

Change-Id: I404da502a6cfa3d8e40ca7ee935332e9e4931968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:41:19 +00:00
Bill Lin
fd8e54e391 Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev 2022-08-25 04:36:14 +00:00
Omer Osman
dc7fdfa060 Update Opus over A2DP to use BluetoothCodecConfig api
Bug: 240635097
Test: sink device using bds-dev
Change-Id: Idd0a0c8a63dc969acbb10a88df5218507017e475
2022-08-25 04:10:18 +00:00
TreeHugger Robot
5d42149249 Merge changes from topic "nfc_logging_control_master"
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
2022-08-25 03:31:24 +00:00
Chloris Kuo
fd947cb0b3 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110

Change-Id: If0ff5b45d3e38a1e5b08cb6a648ea64474b731d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 22:59:00 +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
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
3b0cbefac1 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085 am: bbde399410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Idcaa343d56921b2f2b4428a10fb5dffc99a0c698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:11:16 +00:00
Michael Wright
bbde399410 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:05:15 +00:00
Michael Wright
1218065085 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev 2022-08-24 15:24:15 +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
Wesley Wang
320ad12543 Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92a1 am: 20e927164b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19695293

Change-Id: I288c58df33642427aa8b39f3d1af6f4cb521c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:30:00 +00:00
YK Hung
2d3d452f93 Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev am: 821c5702cd am: 7e9c49305f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19707329

Change-Id: I6be24ea85c35e15310610f90e5a4a109550326f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:29:52 +00:00
Wesley Wang
20e927164b Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19695293

Change-Id: I50b0b62fd268026ac0e79a14df8640f19be5078f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:02:02 +00:00
YK Hung
7e9c49305f Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev am: 821c5702cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19707329

Change-Id: I2f0a4c8b200f69d37d16577ee1131efe2eaba248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:01:54 +00:00
TreeHugger Robot
3588b515f2 Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303

Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:01:14 +00:00
Wesley Wang
a0c76c92a1 Merge "Update extra defend layout string" into tm-qpr-dev 2022-08-24 05:11:03 +00:00
Bonian Chen
4eef87c36f Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe am: 534dbdfd29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214

Change-Id: Ibb21e7203621293265a0075988282afcdccb22a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 05:09:31 +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
Bonian Chen
534dbdfd29 Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214

Change-Id: Ib5200b5c3a0cbf87fc8a8de5991742847b924049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:50:09 +00:00
Chloris Kuo
fe172874ed Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" 2022-08-23 18:35:22 +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
TreeHugger Robot
bab9d6fa0b Merge "Fix udfps fingerprint setting flow" 2022-08-23 11:58:59 +00: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
TreeHugger Robot
63e627ca93 Merge "Show 'Clear storage' on customize manage space button" 2022-08-23 10:47:55 +00:00
Arc Wang
47532e9d76 Show 'Clear storage' on customize manage space button
Settings app may show 'Clear storage' button to clear data
or 'Manage space' button to show app customize manage space UI.

To have a consistent UI, shows 'Clear storage' button
for the 2 cases.

Fix: 241486222
Test: manual visual
      Settings -> Apps -> See all apps -> Photos
      -> Storage & cache
Change-Id: I09f2e651a2844ef809ee269c7114296af69e6bb9
2022-08-23 16:48:00 +08:00