Commit Graph

50732 Commits

Author SHA1 Message Date
Chaohui Wang
26e4d39680 Merge "Not to retrieve Preference_title" into main 2023-08-03 13:42:48 +00:00
Treehugger Robot
b7db2a6ff3 Merge "Clean up unused WifiManager.ActionListener" into main 2023-08-03 13:23:46 +00:00
Zoey Chen
bebaec607e Merge "[Regional Preference] Add description for checked/not checked" into main 2023-08-03 11:30:42 +00:00
Chaohui Wang
e2821e8c44 Not to retrieve Preference_title
No longer retrieve Preference_title in SettingsMainSwitchPreference,
because it's private in androidx, migrate to Preference's getTitle() and
setTitle() instead.

This will help to fix references to resources for Settings in the future
cls.

Bug: 293810334
Test: visual - on Adaptive brightness page
Change-Id: If40a879ff222e980a563662797dffb00f6b62597
2023-08-03 16:48:04 +08:00
Milton Wu
4362ad26e2 [BiometricsV2] Fix skip action for udfps enrolling
When user press "Do it later" in v2 enrolling page, it shall use
cancelEnrollment(true) to wait cancel event and notify activity.

Bug: 294336276
Test: manully test on udfps device
Change-Id: Id8631173fd8082d8a3b264bce46450018c2c1143
2023-08-03 16:41:53 +08:00
Edgar Wang
873c321726 Merge "Make Quick setttings developer tiles searchable" into main 2023-08-03 06:22:22 +00:00
Zoey Chen
0f70d8d690 [Regional Preference] Add description for checked/not checked
Bug: 288223637
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
2023-08-03 04:46:41 +00:00
Eric Biggers
50f93771bc RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:45:19 +00:00
Justin McClain
073059a2c7 Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d am: 6d5ae56ab7 am: 2469a9c0cc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I36e6b269cff0ac2ada526ab3d3a809d500b6b059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 21:59:50 +00:00
Justin McClain
2469a9c0cc Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d am: 6d5ae56ab7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I906643a9b4c923f8c6268eb52326f066e8d0f155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 21:13:54 +00:00
Justin McClain
6d5ae56ab7 Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I3d616f015890d6ec77efc2558aa780553424dcfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 20:30:49 +00:00
Yanting Yang
f5e74b8f49 Merge "Support App details for work profile apps" into main 2023-08-02 20:12:32 +00:00
Eric Biggers
a75824cf37 Merge "Catch exceptions from setLockCredential()" into main 2023-08-02 19:40:27 +00:00
Justin McClain
63256b458d Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I9ae167fda396f42065c30c680bdc66806a02f342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 19:22:29 +00:00
Justin McClain
01dbc55db8 Merge "Adding owners file." into main am: 3bf19b75fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I2f3b523f8ac1988ba51a9cc77b5868ff8f9e0ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:19:22 +00:00
Riley Jones
b4bfea5c54 Expanded accessibility search terms
Items with new keywords:
-Accessibility
-Accessibility Menu
-Autoclick
-Live Caption
-Hearing Aids/Devices
-3-button navigation
-Touch & Hold
-Accessibility Timeout

Bug: 278091482
Test: Build SettingsGoogle, change your system language a few times, then check that the search bar responds to the new terms
Change-Id: Iddaf4f378b63f13141c1c52fbb4daa20f90a5ff8
2023-08-02 17:56:06 +00:00
Zoey Chen
1688c57226 [Regional Preference] Add description for checked/not checked
Bug: 288223637
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
Merged-In: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
2023-08-02 13:18:42 +00:00
Elliot Sisteron
fb86e84186 Merge "Fix entrerprise strings replacement for Safety Center." into main 2023-08-02 12:11:17 +00:00
Chaohui Wang
3cdf5b9be9 Remove context from enterprisePrivacyFeatureProvider
EnterprisePrivacyFeatureProvider is created by using application
context, no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I346f2b0ccbb0590f26954603ab630132cd8be63f
2023-08-02 19:10:31 +08:00
Treehugger Robot
b042f81e34 Merge "Remove context from userFeatureProvider" into main 2023-08-02 10:18:09 +00:00
Chaohui Wang
515c0b8e3a Remove context from userFeatureProvider
UserFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I80ac7124c3278399e562d4d7d49d1847847b92af
2023-08-02 17:25:41 +08:00
Edgar Wang
f77ff76950 Make Quick setttings developer tiles searchable
Bug: 286365859
Test: manual verify
Change-Id: I2b3578d4aa80d48a4dcc29cfaac2f25089f0d4e8
2023-08-02 09:25:23 +00:00
Edgar Wang
a789e9214e Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings" into main 2023-08-02 09:15:56 +00:00
Yu Chao (zhào-yò)
2b2dfebaff Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into main 2023-08-02 08:05:02 +00:00
Chaohui Wang
a2adee5362 Clean up unused WifiManager.ActionListener
Bug: 285231003
Test: m Settings
Change-Id: I84ec6a76e486df207140c0f5cbda1c6727fe4989
2023-08-02 15:08:04 +08:00
Treehugger Robot
6a0adf823c Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a am: 5058935211
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935

Change-Id: Ia625b2356fa07e3264539f31c1239fea977b307f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 05:04:01 +00:00
YK Hung
f6a7b7c349 Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8 am: 5964c972fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476

Change-Id: If040bea85d7eb72805175f2585e1155100d5eb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 05:02:44 +00:00
Milton Wu
804b76ebc3 [BiometricsV2] Refactor EnrollIntroViewModel
1. Refactor FingerprintEnrollIntroViewModel to kotlin and replace
   LiveData as Flow
2. Set importantForAccessibility to sud_scroll_view (porting solution of
   b/244595576 into fingerprint enrollment v2)

Bug: 286198097
Test: atest -m FingerprintEnrollIntroViewModelTest
Test: atest -m FingerprintEnrollmentActivityTest
Test: atest -m biometrics-enrollment-test
Change-Id: Idd4e9d77d040d7efd61342284d7b6a493a20a539
2023-08-02 04:42:36 +00:00
YK Hung
42f0193b4b Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef18d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24124246

Change-Id: I657cab61453b5f7708fcf305d1a9611d3022c4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:26:29 +00:00
Treehugger Robot
5058935211 Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935

Change-Id: Icda113c650b9544ae8218436fdd0a511f76d2aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:23:14 +00:00
YK Hung
5964c972fa Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476

Change-Id: I658e16b80d85c9e7022d57e8f960f11d5e5cd6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:21:53 +00:00
YK Hung
270b7ef18d Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev 2023-08-02 03:30:08 +00:00
Treehugger Robot
103adb753a Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev 2023-08-02 03:26:19 +00:00
YK Hung
1b43697eb8 Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev 2023-08-02 03:23:11 +00:00
Charlotte Lu
710b3379e2 Merge "Password on wifi sharing screen is NOT monospace." into main 2023-08-02 03:04:47 +00:00
Chaohui Wang
c3e68fabe6 Remove PreferenceXmlParserUtils deprecated methods
Bug: 293810334
Test: m Settings
Change-Id: I5456b95dfe4c26dc675b205d67b1db009ee73193
2023-08-02 10:16:31 +08:00
ykhung
69f46a72fc Update the incompatible charging banner tip icon
Update the incompatible banner tip icon based on the UX update:
https://screenshot.googleplex.com/8ApTNJnsxRRufjQ

Fix: 246960554
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I060554c17b3825b38004fb643c0a0cdf5fdbed4d
2023-08-02 02:05:15 +00:00
Austin Delgado
fefbdc7922 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 am: 0abddc88bc am: 2f1b844997
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I7929ac906d7661635604fcd7de5225db49ad6ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 00:32:39 +00:00
Austin Delgado
2f1b844997 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 am: 0abddc88bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I0d3fcbf3af5b717b76b9b07974b687ba770d89db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:47:08 +00:00
Austin Delgado
35579efcaf Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I5ffe93b5c0fe5a52ad841e5e5942363cf0a0d6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:06:10 +00:00
Austin Delgado
0abddc88bc Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I706d8f22283ead587622a6d0fd4907a7b9e93f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:05:19 +00:00
Austin Delgado
c6e7b93f28 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev 2023-08-01 22:13:34 +00:00
Wenhui Yang
cf8ba456bb Add bp subtitle for WiFi sharing
Move the screen lock message selection logic to Utils and update the
related strings as suzannechen@ suggested.

Test: manual (see bug)
Test: atest UtilsTest
Fixes: 291307701
Change-Id: I346c25426395eea1320edc07ce2d962efeb8daa6
2023-08-01 21:11:33 +00:00
Oli Thompson
70a610ea39 Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65 am: ea18752f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668

Change-Id: Ibb0f3930aecd2a12fa54124ccc1f1a7df8f4eb07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:59:43 +00:00
Elliot Sisteron
4688f3f642 Fix entrerprise strings replacement for Safety Center.
In ag/20641184, it looks like we changed the behavior to only replace
titles when in fact some strings were replacing the summary.

This causes some entries to have the summary as the title instead.

Bug: 283743216
Test: Manual
Change-Id: I7157fd04c32eebd89bdb825ccc3e8ef73c9075bf
2023-08-01 17:43:43 +00:00
Oli Thompson
ea18752f4a Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668

Change-Id: I7ba3169002b1d7f7c010ca078d7a723b86788dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:17:00 +00:00
Oli Thompson
04854b1c65 Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev 2023-08-01 16:31:03 +00:00
Jason Parks
bd6af1a484 Fix positive button when the click listener is not null.
Fixes changes made in ag/20171885:
https://screenshot.googleplex.com/4WeHHjy75A96wgf
https://screenshot.googleplex.com/3oQcLiY6AgYurB9

Bug: 252967902
Test: manual
Change-Id: I07985d540347c7b56982a90d386a5f93721344ea
2023-08-01 14:28:35 +00:00
Justin McClain
5f8aeeb9ef Adding owners file.
Test: m
Change-Id: I0b32a9bc0e9be65b3d2ff0ac07d79baa05305205
2023-08-01 13:44:22 +00:00
Yanting Yang
6b02225810 Support App details for work profile apps
App info page stopped supporting the App details feature for work
profile apps in Android N but there is no exact reason from the history.
Try supporting it again to fulfill users' requests and check for
exceptions.

Bug: 264932611
Test: manual & robo and unit tests
Change-Id: I1227cff5e25313905952ba54ab0270cdf4f00fd4
2023-08-01 20:49:24 +08:00