Vania Januar
11603c5be9
Merge "Force enabling Notes role from developer options affects all users."
2023-04-14 09:24:44 +00:00
Treehugger Robot
6065f10f11
Merge "Add dialog for enabling a provider in settings"
2023-04-13 23:24:44 +00:00
Becca Hughes
7d407abf58
Add dialog for enabling a provider in settings
...
Test: manual
Bug: 277923170
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-13 21:29:04 +00:00
Xiaozhen Lin
60e1a88005
Merge "Destroy activity in onStop()" into udc-dev am: d913003d55 am: 88ed2d9a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076
Change-Id: I39dcaaf463ae1def7131230184b4ccf7224bdd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 21:26:33 +00:00
Treehugger Robot
b09b6eb551
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80 am: cdda0b8658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703
Change-Id: I0c26bb3a47410bb60981c99c1aec39d0d4a405cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 21:13:47 +00:00
Xiaozhen Lin
d913003d55
Merge "Destroy activity in onStop()" into udc-dev
2023-04-13 20:45:15 +00:00
Treehugger Robot
3b24bafb80
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev
2023-04-13 20:10:49 +00:00
Lucas Silva
1196360a26
Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: 42f411984a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360
Change-Id: I01d239417080c6bb4c983ba2c9641f8d68fe5706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 18:52:03 +00:00
Lucas Silva
07d056f5c6
Merge "Add intent for entering communal settings" into udc-dev
2023-04-13 18:28:43 +00:00
Xiaozhen Lin
7a89f15fed
Destroy activity in onStop()
...
Pixel Imprint will call onDestroy() whenever its menu is invisible.
(https://source.corp.google.com/tm-dev/packages/apps/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java;l=547?sq=package:tm-dev )
However, Screen lock should have the same behavior as Pixel Imprint but
it doesn't.
onDestroy() for Screen lock should be called whenever we exit the menu
or the menu becomes invisible. Otherwise, the password may be leaked to
RAM unexpectedly in some situations.
Bug: 233373529
Test: manual
Change-Id: Idc0c115fc2061d863f9cab2aed99c04340b827f8
2023-04-13 17:29:48 +00:00
Chiachang Wang
ffda4e6a0d
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc am: cd33a0fa88 am: e428b25ea0 am: c702ecb6ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I7088c510a7f804e3b46d71ff72dea670d1c5e12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 11:24:56 +00:00
Chiachang Wang
e428b25ea0
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc am: cd33a0fa88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I24723fadb4e89560ddb96da8149dc6dfa4e6ce6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 10:25:09 +00:00
Vania Januar
32aae36b37
Force enabling Notes role from developer options affects all users.
...
CP from ag/22598718 due to conflicts in downstream branch.
Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
2023-04-13 09:57:38 +00:00
Chiachang Wang
cd33a0fa88
Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499
Change-Id: I7fb125aacace306aec461e64ae7d448dcec10949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:54:49 +00:00
Zaiyue Xue
6e606674ec
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813 am: 07f3152ad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: Ic4820b148a0375c765f3bd36343c3017fc2b7960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:25:44 +00:00
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
Zaiyue Xue
4d737d7813
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev
2023-04-13 09:06:22 +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
Chiachang Wang
4c5334809d
Merge "Populate ipsecSecret field in VpnProfile"
2023-04-13 08:53:57 +00:00
Zaiyue Xue
bcafd5dfda
Support battery usage chart start index label is the detailed last full charge time
...
https://screenshot.googleplex.com/5dYp7kJpNPMU6Jx.png
https://screenshot.googleplex.com/7ZSbWyCGRFSym6A.png
https://screenshot.googleplex.com/9GsPTa9zd2XttDX.png
Bug: 271214926
Fix: 271214926
Test: manual
Change-Id: Ic869653f66866964f34e111dd2ee8c052313e119
2023-04-13 16:37:35 +08: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
chiachangwang
02156d600d
Populate ipsecSecret field in VpnProfile
...
This commit fixes IKEv2 RSA VPN could not be an always-on VPN
issue to populate ipsecSecret field from "IPsec user certificate".
Fields ipsecUserCert and ipsecSecret are required for a valid
VpnProfile. The ipsecSecret field in VpnProfile should be
populated from "IPsec user certificate" field. It's the matching
private key.
Bug: 263610164
Bug: 230727391
Test: Verify if IKEv2 RSA VPN can setup successfully and set as
as always on VPN
Change-Id: I605b35fff9e399ee7b82d8441137984992ab2907
2023-04-13 07:47:53 +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
Suprabh Shukla
5aeef97cae
Handle corner cases in "Alarms and Reminders" page
...
There are few corner cases and new updates that need to be incorporated:
1. Apps that declare USE_EXACT_ALARM, do not need SCHEDULE_EXACT_ALARM.
So these should be filtered out, regardless of whather they declared
the latter.
2. Apps that are in the power allowlist do not need either of the
permission, and so these should be filtered out as well.
In either case, if the user somehow ends up in the app detail page for
this setting, the switch should get disabled based on existing logic.
Test: make -j RunSettingsRoboTests
Test: Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM
Bug: 232460265
Change-Id: I5aeab49f95260218878bc36f5a4d73a49e5082e4
2023-04-12 19:17:57 -07: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
Lucas Silva
3b1c739ce2
Add intent for entering communal settings
...
This allows other apps to link to communal settings.
Fixes: 276742740
Test: adb shell am start -a android.settings.COMMUNAL_SETTINGS
Test: switched to secondary user, attempted to launch using command
above. Verified it didn't work
Change-Id: I5e845ecba58d8443d41aeea95bc6068a0041cac8
2023-04-12 20:01:14 +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
Treehugger Robot
fd8670a4c1
Merge "Merge TQ2A.230405.003"
2023-04-12 17:22:25 +00:00