Commit Graph

123546 Commits

Author SHA1 Message Date
Treehugger Robot
8e95c6e66a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-12 18:38:34 +00:00
Hao Dong
cc0d6acce1 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: Ibc09759d1c9e30380e2f144fb425b8be92e191be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 18:36:00 +00:00
Hao Dong
e5946f6858 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: I8e08c8cb75e1ae7c794be59081b12c48a79f0735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 18:30:51 +00:00
Hao Dong
ad5954bc94 Merge "Fix biometrics unicorn consent string bug." into udc-dev 2023-04-12 18:02:16 +00:00
Treehugger Robot
fd8670a4c1 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:25 +00:00
ykhung
836dc0d76c Remove plug/unplug condition for the incompatible charging
Remove the plug/unplug condition checking for the incompatible
notification based on the feedback from:
https://b.corp.google.com/issues/276403405#comment3

Bug: 276403405
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Iec177ed33a3cc8cf5a5747b6f65440d31120823c
2023-04-13 00:29:11 +08:00
YK Hung
26b8b4c088 Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805

Change-Id: I237ffcc54e6833e55feb85078e5c5df6629f2718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 16:11:34 +00:00
YK Hung
3c47574638 Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805

Change-Id: I75cc6c46eaa0fdb5436a600ccd70d851417e2c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 16:11:29 +00:00
YK Hung
e4c3f68b56 Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev 2023-04-12 15:43:48 +00:00
Sunny Shao
b0885a155a Add a feature flag for SPA metrics
- Add a new SETTINGS_ENABLE_SPA_METRICS flag.

Fixes: 277540990
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I6da801691fd34fd133ec25d3a45ed6124bec51a1
Merged-In: Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3
2023-04-12 21:38:40 +08:00
Treehugger Robot
2421846dc1 Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639 am: 120dea4cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762

Change-Id: Ieb773c8586317c868deaeccdbfffbf5e68027be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:52:17 +00:00
SongFerngWang
4c206e1a11 Fix the IndexOutOfBoundsException
Bug: 276460284
Test: build pass
Change-Id: If70bd4624b9b94aafa0930f0deba106cff5a2212
2023-04-12 19:50:51 +08:00
Treehugger Robot
c58f9ad608 Merge "Fix empty icon while tapping Auto-rotate screen widget" into udc-dev am: 104e412077 am: fc8eefe521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569799

Change-Id: Ia70ec9d50c536d186c3fa47e5d46ab47e81e1538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:42:34 +00:00
YK Hung
3529a1708f Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78 am: 65f1cf5f6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849

Change-Id: I6e130e7d049dfcdb9357d8f4451d14f4968e4152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:41:09 +00:00
Chris Antol
b247380daf Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2 am: 8780cc2711
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945

Change-Id: Ib67567d558a7cc7aae162169e7795a00c78802c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:37:20 +00:00
Quang Luong
d1a817fd4e Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523 am: 66e88d7802
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593

Change-Id: I695c3be4fb232378da19ee6a7afb7d86efdfec06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:34:41 +00:00
Marcello Galhardo
39cdff5066 Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8 am: 44a2cf0d2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424

Change-Id: I408989611212acb1386edb623cd7354b07189603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:31:13 +00:00
Treehugger Robot
8745d8ea1f Merge "[Panlingual] set direction and textAlignment for the locale dialog" into udc-dev am: ef65b4c580 am: af0bce92de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572956

Change-Id: I3f54da8bccda89d28384cc8dbcbe7b3ad40192d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:24:35 +00:00
Treehugger Robot
7bf829b4a6 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I4ff3013a2cfe2f8839f542383333a8de3b40e3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:23:54 +00:00
Treehugger Robot
423bfef9c8 Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0 am: 672d1ce1fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313

Change-Id: Iaf33fe3131d7941bc87f8ee896cd5ba3be5a6c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:17:14 +00:00
Daniel Huang
174c1faf4e Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de am: fab7adefc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598

Change-Id: Id08f323bb94914749cdecb34f376367ac3a9567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:16:06 +00:00
Edgar Wang
8bf2b8aacf Disable developer options when development_settings_enabled is disabled am: b5774a8e2e am: 0eb7d1b9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562950

Change-Id: I9a6a4d8b1dca8f0719486094f6f8107d18ba90a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:13:24 +00:00
Angela Wang
410eff4ba6 Merge "Fixes Flash Notification preview button alignment issue in RTL layout" into udc-dev am: 11648c709e am: 1eedddc90d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550307

Change-Id: Ia6ed397b398f485223b56f0e9c83e1ea82e9f313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:06:55 +00:00
Treehugger Robot
c366b8381c Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I813ae375553a4082504ccf4b564f78815764a43e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:06:35 +00:00
Marcelo Arteiro
379150e898 Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: If434fe73a3b2147a3bc8dba04f139b6aacaeac84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:06:19 +00:00
Vania Januar
d673f304c1 Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: I59a735c841520363fe6d3ef54b3d8211fadd879f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:05:33 +00:00
Treehugger Robot
d250ee1a8b Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839

Change-Id: I2502ce3c6d41cafc1f5d1012f4ab315c3e1f209a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:04:46 +00:00
YK Hung
9e28310519 Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802

Change-Id: I6d9edbd4191811b450be945c0703e14cf03b83b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:02:30 +00:00
David Liu
9c86b7c1eb Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: Id41cecc98381059d6e0d414a3e6909c47b62621b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:01:30 +00:00
Treehugger Robot
120dea4cf6 Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762

Change-Id: I9aa93ca9c0c9e811c345e61e9ef55e0954343d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 11:00:31 +00:00
Treehugger Robot
fc8eefe521 Merge "Fix empty icon while tapping Auto-rotate screen widget" into udc-dev am: 104e412077
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569799

Change-Id: I044c7db276c59a3aaffb157e0755e9790bdb2c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:59:24 +00:00
YK Hung
65f1cf5f6f Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849

Change-Id: I66ebf1e46fa4244b8ebfe09ebde9cd28e6ac4011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:58:29 +00:00
Chris Antol
8780cc2711 Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945

Change-Id: I0e013606d565e29451497aa1bd609be85a2447a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:57:51 +00:00
Quang Luong
66e88d7802 Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593

Change-Id: I87cee1e5ae0505b09979f99a9ded17975d8f175e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:57:07 +00:00
Marcello Galhardo
44a2cf0d2f Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424

Change-Id: Ifc7bd75a22cae569c03d22eabe03b0e24f6d3be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:53:49 +00:00
Treehugger Robot
a7152b9573 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: Ic9c46e521d8ae7b85dc63fa593e5f05951f596a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:51:42 +00:00
Treehugger Robot
af0bce92de Merge "[Panlingual] set direction and textAlignment for the locale dialog" into udc-dev am: ef65b4c580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572956

Change-Id: Ib98254ecf74e732bbca106ca0fe05950ae504632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:51:15 +00:00
Treehugger Robot
672d1ce1fe Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313

Change-Id: I0871a68ff0926c245b8bbe9199adb7164cc2a2e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:48:37 +00:00
Elliot Sisteron
6a1ec7553c Redirect to the right combined biometrics in work profile.
Bug: 277760649
Test: manual
Change-Id: Iab3e46a6964ceb4bf2241560ad7820844f8ae88c
2023-04-12 10:46:01 +00:00
Chaohui Wang
e13d644f2c Fix create bluetooth dialog repeatedly
When the screen rotates, currently the startActivityForResult() within
RequestPermissionActivity could be called multiple times, so the
multiple RequestPermissionHelperActivity will be created, which caused
the issue.

Replace RequestPermissionHelperActivity with AlertDialog (as an
unfinished TODO of RequestPermissionHelperActivity) can fix this issue.

Fix: 243601277
Test: Manually with adb shell commands
Test: Unit test
Change-Id: If1e2b2807b69a87bbcfffa543ee0da134d4c4312
2023-04-12 18:34:52 +08:00
Daniel Huang
fab7adefc3 Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598

Change-Id: I06351395777f82ccac69ed163b2c13284df12d8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:21:23 +00:00
Weng Su
9f80cd2f77 Add Wi-Fi hotspot > Security Settings page
- Restrict low security type when 6 GHz band is selected
  - Disable "WPA2/WPA3-Personal" security type
  - Disable "WPA2-Personal" security type
  - Disable "None" security type

- Automatically updated security type to WPA3 when 6 GHz band is selected
  - Regenerate password when security type is changed from None

Bug: 245258763
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         WifiHotspotSecuritySettingsTest \
         WifiHotspotSecurityViewModelTest \
         WifiHotspotRepositoryTest

Change-Id: I31b08795419baed10dc40b876aeec175f6f41e69
2023-04-12 18:19:49 +08:00
Edgar Wang
0eb7d1b9de Disable developer options when development_settings_enabled is disabled am: b5774a8e2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562950

Change-Id: Ib7bc2d9048c760ad3ce34efc2cac3f3e392e3db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:18:54 +00:00
Treehugger Robot
525b567db3 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I4dfc995e7185c5cb7a599156d71a198bd434cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:18:17 +00:00
Angela Wang
1eedddc90d Merge "Fixes Flash Notification preview button alignment issue in RTL layout" into udc-dev am: 11648c709e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550307

Change-Id: Iec82c984181e8f50efbb21d2af6e3f30bbf54c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:15:12 +00:00
Marcelo Arteiro
ad2457b1ee Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: I296d9ac0ad5d7d158a505e7ab06ad197bb73b1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:12:21 +00:00
Vania Januar
a24e7dc12a Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: Idd920bd878a20f69844c3d10ded90317ec35981b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:09:19 +00:00
Treehugger Robot
5a88b6f2ff Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839

Change-Id: I0f2ff46d57f9d4bd5b1f6722df21a5f31fb5f804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:07:08 +00:00
Marcelo Arteiro
cab738bf39 Merge "Fix for Check mark color on Regional preferences" into udc-dev 2023-04-12 10:05:10 +00:00
Marcelo Arteiro
df3bf351cd Fix for Check mark color on Regional preferences
https://screenshot.googleplex.com/BkRTpomGg7oXP6C

Test: Manual
Fix: 272398108
Change-Id: Ic762215e35058731ddbd3ea042cb14e0a135793c
2023-04-12 10:04:47 +00:00