PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,419 Commits 1 Branch 0 Tags
00ac6a4e584f59b97dacfcef93fdd4682bcdbf50
Commit Graph

123419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
b24cca079f Merge "Pass Timeout back to upper biometric preference am: 52a46d0a85 am: a4c27fac3f" 2023-04-13 09:25:39 +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
Milton Wu
cccc654e39 Pass Timeout back to upper biometric preference am: 52a46d0a85 am: a4c27fac3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152

Change-Id: I18762da02c530d6867f34bd43cd0a02398ca28f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:24:51 +00:00
Zaiyue Xue
045b856557 Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150

Change-Id: I4ecddfeb0a1a13bff8c84cf755d6209404f33e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:12:25 +00:00
Zaiyue Xue
07f3152ad2 Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150

Change-Id: Icf683ac2919638a3b49d18b84dee325157397295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:12:25 +00:00
Milton Wu
a4c27fac3f Pass Timeout back to upper biometric preference am: 52a46d0a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152

Change-Id: I19bc33b58f8b036f7b52b2820e7154d3e8955379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:12:13 +00:00
Milton Wu
fa091d4a38 Pass Timeout back to upper biometric preference am: 52a46d0a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379152

Change-Id: Iea8dd6641ae9eaded125e398c586aa107f81f229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:12:09 +00:00
Automerger Merge Worker
1e75fe7852 Merge "Merge "Fix settings crashed" into udc-dev am: 2c427629d8 am: af7eb73061" 2023-04-13 09:11:59 +00:00
Treehugger Robot
83bba83bd5 Merge "Fix settings crashed" into udc-dev am: 2c427629d8 am: af7eb73061 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581

Change-Id: I6d92ef3d0f26fbdf97032d80042c97891e506ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:11:22 +00:00
Treehugger Robot
f9d2ca2322 Merge "Fix settings crashed" into udc-dev am: 2c427629d8 am: 973a08ebbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581

Change-Id: I7ba3054f858dca3166030faacf97aa502370a55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:11:16 +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
af7eb73061 Merge "Fix settings crashed" into udc-dev am: 2c427629d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581

Change-Id: Ib1deb2bcbe20b2ff53382a5b22675b06ec70d84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:57:30 +00:00
Treehugger Robot
973a08ebbb Merge "Fix settings crashed" into udc-dev am: 2c427629d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613581

Change-Id: I8bebb153af17308777bce99dcfb0abd0ea5327a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:57:28 +00:00
Treehugger Robot
b7212a3b1e Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: c28e629e66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288

Change-Id: I544f379de97bad56fd0818bee7d1ff42b1232695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:56:42 +00:00
Automerger Merge Worker
e293d5adb1 Merge "Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: 758b0317ad" 2023-04-13 08:56:38 +00:00
Elliot Sisteron
c39dbc6f2b Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 am: ea8f9dd7ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586

Change-Id: I0e32d1ff3a9982f9828361f1a99658d5764423ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:56:32 +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
Automerger Merge Worker
858d2715d3 Merge "[automerger skipped] Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1 am: 2e6d161f99 -s ours" 2023-04-13 08:56:19 +00:00
Treehugger Robot
0804d1eea4 [automerger skipped] Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1 am: 2e6d161f99 -s ours 
am skip reason: Merged-In Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3 with SHA-1 049184fdec is already in history

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

Change-Id: Iff5293440519baff3b861a7f250f67c2f2d36ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:55:18 +00:00
Treehugger Robot
e15456dce4 [automerger skipped] Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1 am: 5411732f9f -s ours 
am skip reason: Merged-In Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3 with SHA-1 049184fdec is already in history

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

Change-Id: I32dbbd823c78469aa4af0ad70c3839abd6813ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:55:00 +00:00
Chiachang Wang
4c5334809d Merge "Populate ipsecSecret field in VpnProfile" 2023-04-13 08:53:57 +00:00
Treehugger Robot
2c427629d8 Merge "Fix settings crashed" into udc-dev 2023-04-13 08:43:45 +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
c28e629e66 Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288

Change-Id: I6b4b377e1606e0472bff9e2d5003cb329f017e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:29:48 +00:00
Treehugger Robot
758b0317ad Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288

Change-Id: Ie06240dd40fed1b91e5404f25de0c3bc1a84a2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:27:54 +00:00
Elliot Sisteron
93ec329d71 Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586

Change-Id: I042d19b86f10a6741380b2dc458d87d68218cf16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:27:44 +00:00
Elliot Sisteron
ea8f9dd7ac Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22576586

Change-Id: Ibfd09de2b6e94543b34ad81b6266df0f877a095c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:27:42 +00:00
Treehugger Robot
5411732f9f Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550303

Change-Id: I77846494531b695f957b09993a8f61b2604ff07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:27:32 +00:00
Treehugger Robot
2e6d161f99 Merge "Add a feature flag for SPA metrics" into udc-dev am: 7c1f28d0e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550303

Change-Id: I48df6cd028cf655e41005967df0bfcc066544ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 08:27:25 +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
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
Mill Chen
3d0eb72b40 Fix settings crashed 
Settings keeps crashed when entering the search page since a footer
preference used a system service that isn't found during the indexing
time. Marking a footer preference unsearchable to fix the crash.

Fixes: 276680407
Test: manual test and the settings search should work properly.
Change-Id: If6fada9285bfb30412dea62377577c14353ab0cc
 2023-04-13 15:17:07 +08:00
Chaohui Wang
979ab75c43 Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb am: 1a2ed24dfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958

Change-Id: Ib7c226d9ff32b718b44e87a528df24858e601a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 06:54:17 +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
Chaohui Wang
3bed84baec Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958

Change-Id: I609419d386fa47c53e1785ef13a6017cee6676bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 06:26:03 +00:00
Chaohui Wang
1a2ed24dfa Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958

Change-Id: If103791211d7574d7ff19af2a8b69972329e86c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 06:25:58 +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
979394609d Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3 am: 64899ed0c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037

Change-Id: I156026b2dcf34b9728980368abd8410b7d2e097b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:49:43 +00:00
Treehugger Robot
64899ed0c6 Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037

Change-Id: I892a3d7cac9a4fe2fef8b50fcfea120ea62ae519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:21:35 +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
Treehugger Robot
34cefb1478 Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037

Change-Id: I91d8a9c8327f30a039e4bc9327692fa7a08835a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:20:43 +00:00
Bill Yi
7237bcb2f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: cb2bb50cd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie32e9ccad42972ef99c23ec2c926108e05142c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:20:28 +00:00
Bill Yi
7b99ebc9e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38c1c29c4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2bdb8726518a338f468da50bd28fbc177a6a664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:20:16 +00:00
Bill Yi
b2924a5856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: aac929ea24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3cc3dabd63528bf0efc2cc94bd53e2732a007e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:20:03 +00:00