Commit Graph

43789 Commits

Author SHA1 Message Date
SongFerngWang
289796e9a3 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I6b76e6a4efe1dcd72c18e503dd3af853c8536276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 19:08:48 +00:00
SongFerngWang
9712359f25 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I7c0faaee0483eab1f36f6ba5646366f2ab523318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 19:07:19 +00:00
Bill Yi
c73b07dc76 Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE
Merged-In: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
Merged-In: I7a2a0e8da3ae59219e9984e8437ce0b1e007bce2
Change-Id: I677947b60b051c89293ca58359cb56b8cbc63ec8
2022-07-07 15:33:30 -07:00
Weng Su
be23c28ff2 Prevent leaking Wi-Fi dialog on lock screen
- The Wi-Fi dialog is designed to be displayed on the system UI

- Dismiss Wi-Fi dialog to prevent leaking user data on lock screen

Bug: 231583603
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: Ie67ff1138ffeddd3e358331d8cef61e0629173e2
2022-07-08 05:43:10 +08:00
Xingbin Feng
3cbff800a3 Fix incorrect storage calculation when SD card is inserted
The displayed internal storage is incorrect when an SD card
is inserted into the device.

Bug: 209962845
Test: Insert an SD card with some content. The System
storage calculation should remain unchanged.

Change-Id: I0a338bc306c0ade68747356714cd291e209a5069
2022-07-07 14:42:57 +02:00
SongFerngWang
286dce6b6e [MEP] Hide the preferred SIM dialog when the user has replaced the SIM
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.

Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.

Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-07 08:39:03 +00:00
Amy Hsu
7087e5c457 [RRS] Activate investigation of screen_resolution in settingsstats
Define a setting string for putting data for suez/settingstats.

Bug: 234035619
Test: Manually check ScreenResolution ap in Settings can work normally.
Merged-In: Ib4622490b0f63139b47f242ebcae916edf291cea
Change-Id: Ib4622490b0f63139b47f242ebcae916edf291cea
2022-07-07 08:15:47 +00:00
TreeHugger Robot
7bdfb34b7b Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028

Change-Id: I37125c165dbb9d48d672666512faec8248bce5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 19:49:52 +00:00
TreeHugger Robot
9447ec6d81 Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev 2022-07-06 19:32:12 +00:00
Aleksandar Kiridžić
1a508148ad Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev am: 7914c77660
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19138106

Change-Id: I3bcdd2d794f7a3f78e24db4e3423583f00b7c297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 18:20:23 +00:00
Weng Su
08adf4c2ed Ignore CRLF strings in display SSIDs to avoid display errors
- Keep user-entered SSIDs in Wi-Fi Configuration

- Ignore CRLF strings in display SSIDs only

Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
Aleksandar Kiridzic
82ef1ef6db speech: Add on-device speech recognition settings entry
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.

The new entry should appear only under the following conditions:
 - An on-device speech recognition service must be available in the
system.
 - A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.

Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
(cherry picked from commit 31473663f5)
2022-06-30 19:12:07 +00:00
TreeHugger Robot
060508e0ee Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 0e4e512d7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I50b4faf9421c34826c1870d3ecb84c0c9fcbe4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:16 +00:00
TreeHugger Robot
2da3d922d5 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I656847a34246a43506198d2d5a8c9cd6cbb34af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:33 +00:00
TreeHugger Robot
0e4e512d7b Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I02ffa271a2896f481148b56558390c1b8f4fee88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:31 +00:00
TreeHugger Robot
10c3e3e56f Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I36354f1a7511077a3499ff95e17992bdffb1f8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:03:13 +00:00
TreeHugger Robot
95dd3a91fc Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: Ib52f8a818aa6601d6e5c0b7e0b0a64e98c85feea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:01:47 +00:00
TreeHugger Robot
526b870f59 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev 2022-06-30 04:39:49 +00:00
Joshua Mccloskey
54b7ac755a Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I80312c96248ff2231386c154ebe0f9bf54ae4f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 17:37:37 +00:00
Joshua Mccloskey
70a6062446 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: If3bf0ca501d6a5bb460fa0ab05ae39239f34720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 17:12:08 +00:00
Joshua Mccloskey
e30a71787e Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev 2022-06-29 16:48:53 +00:00
Xin Li
b8d6e73355 Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
2022-06-28 21:23:28 +00:00
Joshua McCloskey
cdb654f9be Fixed unicorn multi-enrollment flow.
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
2022-06-28 17:08:40 +00:00
SongFerngWang
7c173b36f8 The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 11:45:05 +00:00
Amy Hsu
2ecdab0154 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 6de8a405d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6c0d60693e62bf0fbed8f58ee5571dcf2702638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 11:24:19 +00:00
Amy Hsu
414d2bf243 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I7adc73353a1674fd950ef211cedc857da1d235c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 09:35:42 +00:00
Amy Hsu
6de8a405d7 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: Ia2572f07b47813095947d15d4665a378c1756f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 09:35:41 +00:00
Amy Hsu
d5279ceae3 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev 2022-06-28 09:09:23 +00:00
SongFerngWang
7f6fcce1d5 The UI only shows the active LE device
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-28 15:03:07 +08:00
Amy Hsu
088a212a35 [RRS] Avoid the resolution switch too rapidly.
Make sure previous setting has been completed before we set current
resolution. Register a display listner to listen onDisplayChanged
callback. So that we can know when display resolution change completed.

Bug: 232440665
Test: Switch resolution quickly and check display situation.
Change-Id: I1460c1db191250d8e51dd639cd969e4323f71abd
2022-06-28 01:41:24 +08:00
SongFerng Wang
6293d2a103 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 0018589f09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: Ifb31acb46471b17244ad806986be4ba6c0bed56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:24:01 +00:00
SongFerng Wang
7b3320804e Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I8aa0a982af28ba1a4f8386027ce0382d6b582bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:02:19 +00:00
SongFerng Wang
0018589f09 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f Merge "The UI only shows the active LE device" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Jason Chiu
5df14831b8 Make bluetooth not discoverable via large screen deep link flow
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-06-24 08:16:41 +00:00
TreeHugger Robot
de09f078db Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev am: ce2405e922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19013797

Change-Id: I07be1bdf7db2ce3d619006a0be4bbd7bd1c8827f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:58:42 +00:00
TreeHugger Robot
ce2405e922 Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev 2022-06-24 02:38:54 +00:00
Bill Lin
c51deb5ccd Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev am: 84154328df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034499

Change-Id: I3863cd9fd771e6392ece1a0a8ea7a758067c7ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:53:46 +00:00
Bill Lin
84154328df Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev 2022-06-24 00:41:10 +00:00
lbill
48286b8df0 Well control enrolling icon animation by UX design
T:
* Always plays the scanning animation when user enrolling.

QPR:
* At beginning / Orientation change: Play the scanning animation until user interact with FPS
* When progress moved : Play scanning animation once
* Error : Show message(red color) to notify user

Bug: 232018092
Test: With Rare-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test: With Side-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test:  make RunSettingsGoogleRoboTests ROBOTEST_FILTER= \
"com.google.android.settings.biometrics.fingerprint.FingerprintEnrollEnrollingTest"

Change-Id: I64a1bd24260205b651036c34e6e879b59bef75cc
2022-06-23 08:33:02 +00:00
Bonian Chen
0805e9efbf Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 05:00:56 +00:00
Bonian Chen
2cb39cf969 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Id817b88d0210b620c398b2598a954ec544548833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:52:11 +00:00
Bonian Chen
4e2c3689e3 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ib3003b99cc802e9ade9e0602de83fbc685ece742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:43:51 +00:00
Bonian Chen
31b8174c10 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:27:06 +00:00
Bonian Chen
b88828b155 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:25:38 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Salud Lemus
416595f2dc Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: fd1d882d8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: Ic2101cf866cd697b2dfc3fbb15d9d8ffaf7b4c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:22:54 +00:00
Salud Lemus
fd1d882d8d Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I926409fc54b474b2e8a079767d9eb0dc58056fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:08:03 +00:00
Salud Lemus
26bdfebe0b Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I744f612059441079a6e5604de624536e3361e087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:07:58 +00:00