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

121320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
8313b6b0fb Merge "Fix create bluetooth dialog repeatedly" into udc-dev 2023-04-13 06:02:16 +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
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
70ef00405c Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev 2023-04-13 02:16:15 +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
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
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
e5a98b540e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -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: I2624e36dfdad37be6f90c209d4ea96e5e1db7a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:02:18 +00:00
Treehugger Robot
5d93cea1c7 Merge "Merge TQ2A.230405.003" am: fd8670a4c1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258

Change-Id: I2ebe468438118d275db0ee38a0c0c624207bd771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:00:58 +00:00
Treehugger Robot
8e95c6e66a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-12 18:38:34 +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
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
Marcelo Arteiro
cab738bf39 Merge "Fix for Check mark color on Regional preferences" into udc-dev 2023-04-12 10:05:10 +00:00
Marcelo Arteiro
df3bf351cd Fix for Check mark color on Regional preferences 
https://screenshot.googleplex.com/BkRTpomGg7oXP6C

Test: Manual
Fix: 272398108
Change-Id: Ic762215e35058731ddbd3ea042cb14e0a135793c
 2023-04-12 10:04:47 +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
ff6def3c7c Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: If249a6b219c344edbddade320f06c9f512bffd18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 09:48:24 +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
1452f7dd3a Merge "Align Settings and SystemUI packageName references" 2023-04-12 08:53:22 +00:00
danielwbhuang
d318ac5672 Use ScrollView to include the full layout. 
1. Use ScrollView
2. Give ListView a fixed layout_height

Demo: https://screencast.googleplex.com/cast/NDg1NTE0OTI0MDUxNjYwOHxjNGVjYTA4OC03OQ

Bug: 276416718
Bug: 277153488
Test: manual
Change-Id: Ib1404bb060bf2ca448fe636db07b93c16ce14673
 2023-04-12 16:17:35 +08: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
David Liu
65136fa9f8 Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: I0e597d416f82c54b3efefb3d1559fdc71d63e5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 05:30:37 +00:00
David Liu
a6cd016e9a Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: Ife0d2b27db2c12e2129bc0d39fc521e41d59df59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:44:30 +00:00
David Liu
ae70edc7f5 Merge "Update Settings owners list" am: 1a811a130a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: I921670dd1f5c3b39615d42027de10ff3ee8eb3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:15:38 +00:00