PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,546 Commits 1 Branch 0 Tags
57a077f8a56c52cb7e3f1694c53365a0cf7ef63c
Commit Graph

123546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Milton Wu
e4fe606939 Fix enrolled pages not hide during SUW 
Update mIsFaceEnrollable and mIsFingerprintEnrollable in
BiometricEnrollActivity, and use them to determine the activity flow.

Bug: 270102158
Test: Manually test following cases
      1. Complete fp and face in suw, then back to "Google Service" page
	 to make sure
	 a. Fingeprint introduction page isn't shown
	 b. Face introduction page isn't shown
	 c. ConfirmCredential page is shown
      2. Complete fp in suw, then press back to previous page in Face
	 introduction page. And check Fingerpirnt isn't shown.
Change-Id: Ibc74128f6776128d8a0f4cab014b58057ac0f844
 2023-04-13 14:57:37 +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
Bill Yi
24c70bdc05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8358793b04 -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: I3404131b0ea07bb5d6cd72f23d31806a4c1032db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:19:54 +00:00
Bill Yi
1972b60ef0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0dc9c8274b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If57d64cb0d0306d162a8d014b931f0a2b7eb6e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:19:27 +00:00
Bill Yi
681eb89bef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e2d2c132f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7521b440db06abbf5314e9af8d9a0ab755c3e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:19:02 +00:00
Bill Yi
44ed9dfb76 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-13 05:05:19 +00:00
Bill Yi
9c68107136 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-13 05:05:19 +00:00
Bill Yi
a089683f72 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-13 05:05:19 +00:00
Bill Yi
cb2bb50cd2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Bill Yi
aac929ea24 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Bill Yi
0dc9c8274b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Automerger Merge Worker
4872df63eb Merge "Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 929730c615" 2023-04-13 05:04:05 +00:00
SongFerng Wang
9631c9bc25 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 929730c615 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: Ia0a6abf5d5c551170f4177c12463ea2ffd0dc280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:03:28 +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
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
48d04ef4d3 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: I6d70e0298d4c796a1e607f707ec4fb496e913c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:36:22 +00:00
Varun Shah
b056d0ead5 Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 0c31c38a9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: Ic76b8a655038b1b5a790c0becfd29a35c5948fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:17:24 +00:00
SongFerng Wang
133fe9fbc7 Merge "Fix the IndexOutOfBoundsException" into udc-dev 2023-04-13 04:12:32 +00:00
TreeHugger Robot
03977844cc Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c am: 83692baf4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

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

Change-Id: Id504ebc7b366604b6839e0f7a0604afafadc57d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:44:32 +00:00
Varun Shah
4cf335d53c Merge "Update the default wellbeing package config." into udc-dev 2023-04-13 03:38:10 +00:00
Treehugger Robot
c2ab1f16ba [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours am: d1267c1675 -s ours am: 35f746dade -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Icdace303a527fc021a555094ffd49956ffd6cc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:34:33 +00:00
Treehugger Robot
5894ed0686 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours am: dacb81d743 -s ours am: 635c0e08ce -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: Iccfee42fa416a5498b89cdaf1554f705e8177ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:26:42 +00:00
Bill Yi
08057bd110 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours am: d145911bf1 -s ours am: c3dfe52e8c -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: I69c38582cba570ae3f87ed54da54303b76ed108f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:25:58 +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