PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,803 Commits 1 Branch 0 Tags
154e826ae60e2155a05c97edda086b64c0acfa92
Commit Graph

121803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
154e826ae6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f7a39e56745b0e1bb6ca44dad6ff56067772355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:09:08 +00:00
Bill Yi
23cddc9689 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf8617bcada40ca4924dd6f6b7cc19f3d647703c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:08:52 +00:00
Bill Yi
f6e56e7ad3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ff77937dabcca782b6c8a54138a0c742f868f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:08:34 +00:00
Bill Yi
a60ca8c201 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa75a86c9366e359911775d92df45a1c8b75832e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:08:13 +00:00
Bill Yi
10284d973a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 17:18:38 +00:00
Bill Yi
43599d0404 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 17:18:38 +00:00
Tetiana Meronyk
6b07394a8d Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660

Change-Id: Ib57b9a1d2489b702c47d49d0f53dd1533fbf080c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 17:17:31 +00:00
Tetiana Meronyk
d280e9e110 Merge "Align multiple admin related strings with UX design" into udc-dev 2023-04-13 17:08:31 +00:00
Tetiana Meronyk
b4227c18fb Align multiple admin related strings with UX design 
Bug: 266558832
Test: manual visual
Change-Id: I69d2d12b24d64f058ed8ed59c6d979c9c37b74cb
 2023-04-13 14:47:25 +00:00
Chiachang Wang
02210d5752 Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc am: cd33a0fa88 am: e428b25ea0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: Ib1a3ac04d9463896322b6cd716024f9f95402fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 10:57:07 +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
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
Chiachang Wang
4770d017dc Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I0094a812955100bf9fae19dfae028ae33167caa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:25:49 +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
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
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
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
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
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
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
8313b6b0fb Merge "Fix create bluetooth dialog repeatedly" into udc-dev 2023-04-13 06:02:16 +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
6ad5b9a5f3 Merge "Fix b/277880435: System battery settings app crash" into udc-dev 2023-04-13 04:50:59 +00:00
SongFerng Wang
929730c615 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: Ic8bdf4721b788fff506a9bcd6668ca9d317d5527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:36:30 +00:00
SongFerng Wang
133fe9fbc7 Merge "Fix the IndexOutOfBoundsException" into udc-dev 2023-04-13 04:12:32 +00:00
Varun Shah
1d00be1ad5 Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: Ic6a7dad6b860f114b972ae431f53fc25130e9093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:51:21 +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
f2e7f45fe6 Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

Change-Id: I8acb55c68dfa080548169dcbcc24b634aa2db297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:47:51 +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
Daniel Huang
b009dc72a3 Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537

Change-Id: Icb6eda297355ad036fb5496534392049bba76483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 01:03:03 +00:00
Daniel Huang
6e55a52559 Merge "Use ScrollView to include the full layout." into udc-dev 2023-04-13 00:41:45 +00:00
Treehugger Robot
30f5c10510 [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours am: d1267c1675 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Ib0730278efa661553c3a7a11f6cbb085e3886e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 21:13:23 +00:00
Treehugger Robot
d1267c1675 [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours 
am skip reason: skipped by user delphij

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

Change-Id: I748bb0da37a29aca390990332e5872deb256b16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:57:11 +00:00
Treehugger Robot
2f0557495d [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Iff5558b9267a6282536f16601d67959e58c347d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:23:01 +00:00
Treehugger Robot
3ae935bc1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours am: dacb81d743 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I358e473fcfab1cf2ae14686efa59e7da6eaa50a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:17:51 +00:00
Bill Yi
009f4b1ee3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours am: d145911bf1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49abc6aac58d8989d5984e8d91541f2968870535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:17:14 +00:00
Treehugger Robot
dacb81d743 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I820a1cf4aa87dfc27dd707a5580cdb2bc77dda7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:48:15 +00:00
Bill Yi
d145911bf1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd2d1235c08bc145d4570476875db69efc8d9843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:47:52 +00:00
Bill Yi
4c6996b55c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours am: e5a98b540e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdb7a90dd2e56fae76a269bf78479cc306e6177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:05:43 +00:00