Milton Wu
9930d325ee
Pass Timeout back to upper biometric preference am: 52a46d0a85 am: fa091d4a38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152
Change-Id: I0371fa58c1d412538bf499ada83c73146eb0af70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:24:59 +00:00
Milton Wu
52a46d0a85
Pass Timeout back to upper biometric preference
...
When FaceSettings or FingerprintSettings are closed because of onStop(),
this information can't been passed back to previous Preference screen,
CombinedBiometricSettings, because handlePreferenceTreeClick() from
AbstractPreferenceController class only can launchActivity() throguh
preference's Context.
In order to recevice the activity result code from FaceSettings or
FingerprintSettings, add handleBiometricPreferenceTreeClick() method in
BiometricStatusPreferenceController. Then CombinedBiometricSettings uses
this method to show FaceSettings or FingerprintSettings through
launchActivityForResult().
Bug: 263057093
Test: atest BiometricNavigationUtilsTest
Test: Manually open camera through double-click power key on different
pages inside "Face & Fingerprint Unlock"
Change-Id: I99167739766ad5ea5f204b0f0543ba6ad18fac31
2023-04-13 09:02:18 +00:00
Treehugger Robot
a50f75532a
Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: 758b0317ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288
Change-Id: Ic5be47e2240a4ece4853a2e772142c0bdeea7f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:56:32 +00:00
Elliot Sisteron
47aaf4827b
Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 am: 93ec329d71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586
Change-Id: I03a34d6376da35ba447e052dc714e18ccd6f04f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:56:23 +00:00
Treehugger Robot
be76ebdc5b
Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev
2023-04-13 08:24:34 +00:00
Elliot Sisteron
37dad2b3d4
Merge "Redirect to the right combined biometrics in work profile." into udc-dev
2023-04-13 07:55:05 +00:00
Treehugger Robot
7c1f28d0e1
Merge "Add a feature flag for SPA metrics" into udc-dev
2023-04-13 07:51:40 +00:00
Chaohui Wang
bade118967
Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb am: 3bed84baec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958
Change-Id: I3dd368195f69f0affdc14b6f7e259fac737ea3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 06:54:05 +00:00
Treehugger Robot
f2e19ca33f
Merge "Add a feature flag for SPA metrics"
2023-04-13 06:11:15 +00:00
Chaohui Wang
8313b6b0fb
Merge "Fix create bluetooth dialog repeatedly" into udc-dev
2023-04-13 06:02:16 +00:00
Treehugger Robot
c2038e6e53
Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3 am: 34cefb1478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037
Change-Id: I6eee674f8a1d5f0bb5a5fa265259c67ef2c74037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 05:21:31 +00:00
SongFerng Wang
e58f81e111
Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 48d04ef4d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808
Change-Id: I6a592946e72a21eabf764a00834fae37e4a3d4ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 05:03:27 +00:00
Treehugger Robot
6ad5b9a5f3
Merge "Fix b/277880435: System battery settings app crash" into udc-dev
2023-04-13 04:50:59 +00:00
SongFerng Wang
133fe9fbc7
Merge "Fix the IndexOutOfBoundsException" into udc-dev
2023-04-13 04:12:32 +00:00
Varun Shah
582f0e130c
Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 1d00be1ad5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865
Change-Id: If3aaeebba9ebde14a1a7f04a570a515b23b36234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:52:18 +00:00
Varun Shah
4cf335d53c
Merge "Update the default wellbeing package config." into udc-dev
2023-04-13 03:38:10 +00:00
Zaiyue Xue
29da0e6d9f
Fix b/277880435: System battery settings app crash
...
Bug: 277880435
Fix: 277880435
Test: manual
Change-Id: I369c04584c95c13e8636b5c9713e26e528ab627a
2023-04-13 11:23:46 +08:00
TreeHugger Robot
ece31ef275
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c am: f2e7f45fe6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I99703722ae243086389eab49563a715f7a7513c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:23:07 +00:00
Hao Dong
e382c39e38
Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94 am: e5946f6858
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994
Change-Id: Ied41df2285a984d0cc9220244f7208acf40dca8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:15 +00:00
YK Hung
f4d44bcfff
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56 am: 3c47574638
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I8f7828fb51361ff560984b1de0320b234e7adb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:04 +00:00
Treehugger Robot
e3c1bbf359
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573 am: 7bf829b4a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: Ica0b365494d5d14acfddeb84dd83b28e81b13e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:23:22 +00:00
Vania Januar
c7329bf42e
Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a am: a24e7dc12a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282
Change-Id: I836cfd095b654ef4b55abb1474a19cd4ced4f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:20:27 +00:00
Treehugger Robot
b6f09d0f91
Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b am: 5a88b6f2ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839
Change-Id: I3c412e417aab68353affa987f73c579deea523c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:18:21 +00:00
YK Hung
cb1c18f1c6
Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd am: d02dc7bf44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802
Change-Id: Ie6be75840c35f2cba9a4c60041af91a8e56b09ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:18:06 +00:00
TreeHugger Robot
70ef00405c
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev
2023-04-13 02:16:15 +00:00
Sunny Shao
049184fdec
Add a feature flag for SPA metrics
...
- Add a new SETTINGS_ENABLE_SPA_METRICS flag.
Bug: 277540990
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3
2023-04-13 02:02:34 +00:00
Treehugger Robot
7afb2d4440
Merge "Remove unused MagnificationPreferenceFragment and its related controllers"
2023-04-12 19:33:30 +00:00
Hao Dong
ad5954bc94
Merge "Fix biometrics unicorn consent string bug." into udc-dev
2023-04-12 18:02:16 +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
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
SongFerngWang
4c206e1a11
Fix the IndexOutOfBoundsException
...
Bug: 276460284
Test: build pass
Change-Id: If70bd4624b9b94aafa0930f0deba106cff5a2212
2023-04-12 19:50:51 +08: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
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
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
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
Vania Januar
b79772ac3a
Merge "Add developer options to force enable Notes role." into udc-dev
2023-04-12 09:54:15 +00:00
Treehugger Robot
568ba14b9b
Merge "Fix App languages for work profile" into udc-dev
2023-04-12 09:35:32 +00:00
Zaiyue Xue
a2ab3ae5b3
Small refactor battery usage code according to the comments in previous cls.
...
Bug: 262802531
Test: presubmit
Change-Id: I0d496fc6a41af5964311dafe8dd89f8b8058de82
2023-04-12 17:24:16 +08:00
Treehugger Robot
ed69cebe02
Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639 am: e1d5cef1a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762
Change-Id: I78e494412b8d83c1c835a0827fc9bfae7d38d346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:14:41 +00:00
YK Hung
9acd1d242e
Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78 am: 577619ea3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849
Change-Id: I7e149e59fa3413780f4148e3fb28485e7230ef73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:14:13 +00:00
Chris Antol
ec65b5076e
Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2 am: 49da028eb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945
Change-Id: Ie7f7b4f1dc979da58249741fe2cba8ffdf88ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:59 +00:00
Quang Luong
7765d8f0e3
Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523 am: bff112fe67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593
Change-Id: I6712458191ae8651b3a20605876350bf72af7eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:46 +00:00
Marcello Galhardo
a05861a673
Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8 am: e2134a58bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424
Change-Id: I4eda1dfbe9e255f99bd36c6e06fb564290aab166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:34 +00:00
Treehugger Robot
3a27d850b8
Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0 am: cfcef716f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313
Change-Id: Ic45e3d9f20db9d89a34fc0d053ea48d056d907c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:21:46 +00:00
Daniel Huang
5d0ff56d1b
Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de am: db8da44071
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598
Change-Id: Ia45884c4867c0de8d9929a8311b71b0751ae87a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:21:04 +00:00
Edgar Wang
0f6686392d
Disable developer options when development_settings_enabled is disabled am: b5774a8e2e am: 7644d60020
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562950
Change-Id: I8f2a65836e905616d5c19a7852e5eaf112e61afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:20:28 +00:00
Chaohui Wang
4388e217d8
Merge "Display App installed in other user in All Apps" into udc-dev am: 4c1e924442 am: 03e8ebc4dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22546422
Change-Id: Ifa44a57f688fcbac11a4c77942a74d1cabc395ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 06:04:32 +00:00
YK Hung
c00fb2efbd
Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev
2023-04-12 06:01:00 +00:00