Commit Graph

119556 Commits

Author SHA1 Message Date
Tsung-Mao Fang
c923d29c08 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137

Change-Id: Ic31163255a4a53af7b3473067afbd6e21ba11147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:33 +00:00
Tsung-Mao Fang
4332b3266e [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 b34ff2f272 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138

Change-Id: Ia867eecc252f5bc5e95e2fd49e2802e9f1d413dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 02:17:27 +00:00
Arc Wang
4b12201ec4 Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev
* changes:
  [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
  FRP bypass defense in the settings app
2023-01-04 01:52:01 +00:00
Arc Wang
9a6c84c47e Merge "FRP bypass defense in the settings app" into sc-v2-dev 2023-01-04 01:51:22 +00:00
Grace Cheng
8ada95641a Updates sfps animations for natural orientation
Updates enroll find sensor animations given sfps natural orientation switch from landscape to portrait

Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollFindSensorTest
Fixes: 264274708
Change-Id: I392767d2bde98e3509eef29f3095b2dafee16a30
2023-01-04 00:00:45 +00:00
Yasin Kilicdere
77522a55b6 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452 am: 541a984ce0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I4cc7323cab92d38b67aa5bdfa8cd7226a4f835f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 23:35:03 +00:00
Yasin Kilicdere
541a984ce0 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 23:03:32 +00:00
TreeHugger Robot
93c6f2bb3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 20d80e79da -s ours am: a1903f88aa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846098

Change-Id: I53bfdf68df4f515fa615a408ec4e0b7dc1037654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:39:06 +00:00
Bill Yi
ac4cf0c7f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5baeaab354 -s ours am: 1dbf29aa1d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846098

Change-Id: I086922ea578df128ce9976e46a2cf3f6872f620c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:38:58 +00:00
TreeHugger Robot
1e9108db19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3988c628f1 -s ours am: 300534f327 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846097

Change-Id: Ie8b814999476c7e26c40fd503c3cb8d869c57bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:38:52 +00:00
Bill Yi
4c5780d8a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5c5fb43da -s ours am: e2b79d8fcc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846097

Change-Id: Ib5472327c35124e2d105fc18b069fa91e5229700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:38:40 +00:00
Bill Yi
ba9d08b044 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aca33157e1 -s ours am: e192853dd4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846096

Change-Id: Ib016f0e3b4e1b1c4025ef6d0352a4da5e5638c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:38:18 +00:00
TreeHugger Robot
a1903f88aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 20d80e79da -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846098

Change-Id: I53d89a62410dfdd0601771857cde28fdbfab92ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:08:01 +00:00
Bill Yi
1dbf29aa1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5baeaab354 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846098

Change-Id: Ic0cee3b35f9e58f571a1cbf368dbbf80e7b11baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:58 +00:00
TreeHugger Robot
300534f327 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3988c628f1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846097

Change-Id: Icec8066206f26fcf53ec7a9cb68c36fd11f4dfed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:49 +00:00
Bill Yi
e2b79d8fcc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5c5fb43da -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846097

Change-Id: I93b51be84ce0fa9bac390f000f251e576e3c2d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:28 +00:00
Bill Yi
e192853dd4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aca33157e1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846096

Change-Id: I50d45da7db6f6c3e0691efea1dcaa0211568de45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:07:09 +00:00
Hao Dong
af35c7cb9d Add a flag for moving UdfpsEnroll* from SystemUI to settings.
The added files in this CL are mostly copied from SystemUI. Enabling the flag SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS with this CL, the udfps enrollment icons and progress bar are shown in settings.

Turn this flag on via adb:
adb shell setprop sys.fflag.override.settings_show_udfps_enroll_in_settings true

There are some known issues that will be fixed in the following CLs, including:
- When the finger is down on the screen and the lighting circle on the sensor is shown, the fingerprint icon is not hidden.
- When rotating the screen, fingerprint location is not right.
- Currently the scale factor is hard coded for pixel 7 pro, we should update the scale factor based on the device, etc.

Test: manually tested on device
Bug: 260617060
Change-Id: I5aede070eb1de9eb3b5e1400d6e51a8523079852
2023-01-03 19:37:42 +00:00
Bonian Chen
6a3e40e87e [Settings] Adjust string resource for ID
Bug: 260806431
Test: build pass
Change-Id: I49a7fe8b504651446be0c0ebdbaa48d764473372
2023-01-03 15:34:44 +00:00
Yasin Kilicdere
85379e9452 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
b408ef540d Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: Ie2670823d5820f75d101fc6236c8154869db88d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 12:52:43 +00:00
Yasin Kilicdere
15a89a60ac Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev 2023-01-03 12:18:58 +00:00
changbetty
0dcd6a5492 [RESTRICT AUTOMERGE] Change the intent flag to immutable
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
Merged-In: I68132f863027fab19351b4fdbc363e5c274e3327
2023-01-03 10:25:29 +00:00
Shen Lin
bdcfaceeb2 Fix NPE in BluetoothPairingController when comparing BluetoothClass
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Chaohui Wang
36903136af Fix AppDataUsagePreferenceTest#whenHasDataUsage
Fix: 264141691
Test: Unit test
Change-Id: I208f6f8f04d0ed59e31b795f5c90a64e0f76cfa3
2023-01-03 11:47:25 +08:00
Chaohui Wang
7430578af1 Merge "Add SpaAppBridgeActivity for application usage" 2023-01-03 03:06:18 +00:00
Betty Chang
a50fb6ec33 Merge "To check the bond state when get the connection state" 2023-01-03 02:20:03 +00:00
Grace Cheng
04c630ca8a Adding product string variants on choose lock page
Adding product string variants on choose lock page

Test: (manual) observe fixed string on tablet on choose lock page
Fixes: 250807976
Change-Id: I4a0ab0a019708f3e0d81602967b187f6a7089dc5
2023-01-01 21:26:52 +00:00
TreeHugger Robot
05e75b5f23 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-31 06:42:16 +00:00
TreeHugger Robot
d161ba7652 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-31 06:41:21 +00:00
TreeHugger Robot
20d80e79da Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-31 06:37:56 +00:00
TreeHugger Robot
3988c628f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-31 06:37:56 +00:00
TreeHugger Robot
2451afc0df Merge "Refine TetherSettings to avoid activity leaks" 2022-12-30 16:41:19 +00:00
Vania Januar
eb09f89679 Intent to open USI device details page.
Bug: 261584943
Test: manual
Change-Id: I2bdf512a6700374c38942b033d7f75b7bd856051
2022-12-30 13:24:29 +00:00
Vania Januar
3dcceea28f Merge "Set title for Bluetooth Details page to "Stylus" for styluses." 2022-12-30 09:32:43 +00:00
Bill Yi
6f5f00347a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8736d107ef01c74fe10cde612a006ef37104bf75
2022-12-29 21:31:09 -08:00
Bill Yi
fb0de39122 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I152075aaac2023a4a16f7bd0bbe429a031265bd6
2022-12-29 21:30:04 -08:00
Bill Yi
c3804e1e0e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9a95da6b54a02999cced31a315494a2c39e9eb8b
2022-12-29 21:27:02 -08:00
TreeHugger Robot
e37f265f31 Merge "Remove unused logic" 2022-12-30 05:21:01 +00:00
Bill Yi
5baeaab354 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If04ffff758b1c88b3b7576858f8760893ee04bcf
2022-12-29 20:55:43 -08:00
Bill Yi
c5c5fb43da Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaabefc3fcd1e7c28c769f416ad25a32c37beaac0
2022-12-29 20:54:14 -08:00
Bill Yi
aca33157e1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia82d4eaed61ad8144ea278b4b64f6391cb044fb3
2022-12-29 20:51:10 -08:00
Tom Hsu
94cd62ff00 Merge "[Regional Preference] Add each option entry" 2022-12-30 03:20:13 +00:00
XingHai Lu
df1fc7e0fa Merge "Cleanup plurals format Change <one> to <1> in string res file Test: Update, existing tests still pass bug: 199230342" 2022-12-30 02:44:25 +00:00
Milton Wu
160661dc6d Launch settings for clicking fingerprint unlock
Launch FingerprintSettings directly when user clicks "Fingerprint
Unlock". Let Fingerprint settings peform confirmLock() or chooseLock().
And to have smoothly animation, instead of generating challenge in
FingerprintSettings::onActivityResult(), challenge is generated in next
visible activity, and pass it back through next activity result.

Bug: 197717071
Test: atest GatekeeperPasswordProviderTest CredentialModelTest
Test: atest AutoCredentialViewModelTest FingerprintStatusUtilsTest
Test: RunSettingsRoboTests2 FingerprintEnrollIntroductionTest
Test: Manually test fingerprint enroll in settings or suw
Change-Id: Ie27c3c493ea475f6b53cb6bb3f2d45d555f47cb3
2022-12-30 10:01:06 +08:00
TreeHugger Robot
ca0ff60d63 Merge "Fix the end-icon missing issue for Wi-Fi networks" 2022-12-30 01:29:29 +00:00
Weng Su
fbe02cd543 Fix the end-icon missing issue for Wi-Fi networks
- Because WifiEntryPreference needs to support policy transparency, the inherited class is changed from Preference to RestrictedPreference.

- The RestrictedPreference will hides the end icon as default, causing this issue to happen.

- Override the getSecondTargetResId() function with necessary resource id to avoid the end-icon being hidden.

- Remove the redundant setWidgetLayoutResource, because it will be initialized in the extended class.

Bug: 262456749
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest

Change-Id: Ie3d3a649d3137dc705d7887c8e74592437d9ce61
2022-12-30 05:06:54 +08:00
Vania Januar
8811c177ea Merge "Pass CachedBluetoothDevice into StylusDevicesController." 2022-12-29 14:55:56 +00:00
TreeHugger Robot
6d8127677e Merge "Fix overlapping issue in Security certificate page" 2022-12-29 14:45:23 +00:00