Commit Graph

49423 Commits

Author SHA1 Message Date
Hao Dong
d4f621f613 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042

Change-Id: I8a065cfc1717fbc5036573c8c46cb8eee01c0e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 19:40:14 +00:00
Hao Dong
bee02bbbe7 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev 2023-07-06 18:45:27 +00:00
Tetiana Meronyk
70bdc38d4a Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169

Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269 Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev 2023-07-06 13:17:36 +00:00
Quang Luong
e90bb0aedc Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053

Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d Merge "Use speed string from WifiEntry" into udc-qpr-dev 2023-07-06 01:49:56 +00:00
Tetiana Meronyk
b88bad678d Fix "Allow guest to use telephony" toggle not updating its value
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Chaohui Wang
e76ff6ffa5 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 09:41:58 +00:00
Chaohui Wang
a51e013746 Fix DataUsagePreferenceController ANR am: d42cc8e5e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 09:03:56 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Daniel Huang
0b95f9562a Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768

Change-Id: I6360dd0b9ced21331d5e04a54ef91b7612d35c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 03:29:21 +00:00
Daniel Huang
114d068fbb Merge "Log metrics for PK settings topics" into udc-qpr-dev 2023-07-04 02:26:13 +00:00
Hao Dong
fefda226f7 Add super call in FingerprintEnrollEnrolling onConfigurationChanged.
Test: N/A - fix a crash
Bug: 289458339

Change-Id: Id34b1036fe12079b14cd3aaa0a85eecc138e6b17
2023-06-30 21:29:07 +00:00
Allen Su
477102b991 Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832124

Change-Id: Ied97c0d79cbea42830b43b6a2240ac9e5b376f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 16:41:03 +00:00
Allen Su
5d207a7b4b Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev 2023-06-30 16:08:25 +00:00
Treehugger Robot
fedd6b35a4 Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I661f8298b34ef531038006e4881b7caf984bd4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 15:36:49 +00:00
Treehugger Robot
dc98948cc1 Merge "Check P2P channel before requesting network info" into udc-qpr-dev 2023-06-30 14:48:12 +00:00
Michael Mikhail
0d1b67b73e Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: Ied51926e720f598bceb21bae336d77d4313b6724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 13:52:36 +00:00
Michael Mikhail
c156b6c427 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
2023-06-30 12:56:45 +00:00
Treehugger Robot
063ba027f7 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Icbb09dc1917780104f35e797bffd5b2c51f6ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 07:34:05 +00:00
Treehugger Robot
369a1097c8 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev 2023-06-30 06:55:47 +00:00
tom hsu
0b3da89a91 [Settings] Fix inactive SIM show display name with subectiption id.
- Cached active SIM' display name with last 4 digits phone number to
   avoid that this active SIM change to inactive SIM then show the
   display name with subscription id.

Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
2023-06-30 05:51:40 +00:00
Zoey Chen
35920cd80f [Panlingual] Change the metric's string in Languages am: 6358f613cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869863

Change-Id: I1c657933cad5e0d7fc20d7ce323cf9045e8fdb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 05:02:21 +00:00
Quang Anh Luong
36d71f8785 Check P2P channel before requesting network info
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.

Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
2023-06-30 12:21:30 +09:00
Zoey Chen
6358f613cf [Panlingual] Change the metric's string in Languages
Bug: 279915462
Test: manual
Change-Id: I8e59f9acb068640da64d2a29cc6074b388994554
2023-06-30 02:59:10 +00:00
Hao Dong
b911186928 Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:07:43 +00:00
Hao Dong
55ec9b88d6 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:06:58 +00:00
Hao Dong
04b1932b25 Merge "Fix pattern rotation header text." into udc-d1-dev 2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev 2023-06-29 23:51:50 +00:00
Treehugger Robot
bb87b47d60 Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd738d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766

Change-Id: Ic1ec5e652cff3d5a594230038030ad2f32e3bb05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 17:15:58 +00:00
Treehugger Robot
e42dcd738d Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev 2023-06-29 16:42:19 +00:00
Tetiana Meronyk
434b34c79f Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev am: f059fb9a27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781311

Change-Id: I8ef824acc1e0d61f520ecf0fb6cdc0486200c73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 08:02:19 +00:00
Tetiana Meronyk
f059fb9a27 Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev 2023-06-29 07:31:06 +00:00
Shawn Lin
de251cc896 Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev am: f733b7b0ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23737990

Change-Id: I5bd4af0f4cb253420132411a955f548a9ada4446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 04:24:53 +00:00
Allen Su
c871c5654d [Panlingual]Log metrics for App's locale from the suggested
Bug: 258128535
Test: atest AppLocalePickerActivityTest
Change-Id: I007c0e76d8b88f08518ba2696d42bd1db194f5b7
Merged-In: I007c0e76d8b88f08518ba2696d42bd1db194f5b7
2023-06-29 03:44:11 +00:00
Shawn Lin
f733b7b0ff Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev 2023-06-29 03:40:36 +00:00
SongFerng Wang
4b970a47ec Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b289
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564

Change-Id: I3890bf56ae360167ab88442c444a49d438edc8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:15:08 +00:00
SongFerng Wang
73c811b289 Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev 2023-06-29 02:37:44 +00:00
Matías Hernández
281c4b631c Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:44:07 +00:00
Matías Hernández
e20f52a05a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:39:16 +00:00
Matías Hernández
9feb898da7 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:35:52 +00:00
Matías Hernández
aaddfd88e9 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 17:14:55 +00:00
Matías Hernández
4d34eb2c7a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev 2023-06-28 16:42:13 +00:00
SongFerng Wang
c123b2e5a8 Revert "Update the wording for LE Audio"
This reverts commit f4c5c8ef5e.

Reason for revert: at stage3, removing this summary.
Bug: 289184862
Change-Id: I6b18a7e2dee9d8fcfb331e53d7a57cc43574da54
2023-06-28 10:06:59 +00:00
Shawn Lin
a2e032bb8e Fix lock pattern is truncated during SUW in folded state
Remove the bottom margin of the header view.

Bug: 285290323
Test: 1. Go through SUW
      2. Select lock pattern
      3. Check if UI truncated
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
      com.android.settings.password.SetupChooseLockPatternTest
Change-Id: I48ac3d897e6b876bd7a1c325cc4a5e797e140da2
2023-06-28 06:52:40 +00:00
Treehugger Robot
fac986e071 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056

Change-Id: I15eb02f35ba2bad14edd6ef00374216aa8b5b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:07:37 +00:00
Hao Dong
7b99d92464 Fix pattern rotation header text.
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
Merged-In: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-27 17:50:15 +00:00
Hao Dong
2ca3f3232c Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Michael Mikhail
7c9958aafd Trigger talkback for notification volume change
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.

Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.

Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-06-27 17:42:11 +00:00