PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,162 Commits 1 Branch 0 Tags
ae9e09eae34c9853cc019f13de5674aa762c9be5
Commit Graph

20969 Commits

Author SHA1 Message Date
Behnam Heydarshahi
a38edf1ab2 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev am: c46e8546b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24664970

Change-Id: I08ca157dc7fc5ac41697023265268603e737c044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 17:21:07 +00:00
Behnam Heydarshahi
c46e8546b5 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev 2023-09-15 16:52:10 +00:00
Joshua Mccloskey
48621c5aea Merge changes If2fc46b1,Ib54da7a8 into main 
* changes:
  Add enroll() in FingerprintManagerInteractor.
  Fix SettingsV2 tests.
 2023-09-15 16:03:04 +00:00
Chaohui Wang
14655b03fb Merge "Fix AppInstallerInfoPreferenceTest flakiness" into main 2023-09-15 15:57:50 +00:00
Behnam Heydarshahi
374b417b68 PanelSlicesAdapter: load slice label safely 
Load the slice action label string safely when action label is set, and
no longer at adapter instantiation time.

Bug: b/298571448

Test: atest PanelSlicesAdapterTest
Change-Id: I0d5b6e0b2db2fa78d3f58ae2cb96f14437923ffd
 2023-09-15 14:44:33 +00:00
Elliot Sisteron
f348c2c0b6 Merge "Handle "Blocked by your IT admin" better." into main 2023-09-15 14:19:32 +00:00
Manish Singh
8cef63acc1 Merge "Remove temp workaround for feature flag" into main 2023-09-15 10:13:01 +00:00
Chaohui Wang
5b439a3f44 Fix DevelopmentSettingsTest 
And MoreWirelessSettingsTests.testVPNMenuLoad

Bug: 290684887
Test: ui test
Change-Id: I37ef70d1f6f75cd1721ab9ba0763f7ec20be80d0
 2023-09-15 12:15:39 +08:00
Treehugger Robot
51749d4418 Merge "Refresh title in the Network details header" into udc-qpr-dev am: 6aaf49dc1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755454

Change-Id: Ic692b1ad20ae7a0ba31f2dbd6bfa3aa3cbb42024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 04:04:46 +00:00
Chaohui Wang
d835649147 Merge "Extract app data usage to AppDataUsageRepository" into main 2023-09-15 03:00:53 +00:00
Chaohui Wang
fc7a1e01a9 Merge "Clean up SettingsUnitTests unused dependencies" into main 2023-09-15 03:00:21 +00:00
Weng Su
fafdf08535 Refresh title in the Network details header 
- Since the title information may be updated later, it needs to be refreshed continuously to display the latest results.

Bug: 299514568
Test: manual test
atest -c WifiDetailPreferenceController2Test

Merged-In: I4634c152b550c59bd9854cde1b91da44442aa879
Change-Id: I4634c152b550c59bd9854cde1b91da44442aa879
 2023-09-15 02:52:38 +00:00
Hao Dong
2200f55ffe Add enroll() in FingerprintManagerInteractor. 
Test: atest FingerprintManagerInteractorTest
Bug: 295206773

Change-Id: If2fc46b1c952c3e55c698a18e125e194efe5ffb6
 2023-09-14 23:08:33 +00:00
Weng Su
54d0709409 Refresh title in the Network details header 
- Since the title information may be updated later, it needs to be refreshed continuously to display the latest results.

Bug: 299514568
Test: manual test
atest -c WifiDetailPreferenceController2Test

Change-Id: I4634c152b550c59bd9854cde1b91da44442aa879
 2023-09-15 04:45:25 +08:00
Chaohui Wang
c31474c02c Extract app data usage to AppDataUsageRepository 
From DataUsageList for better organization and testing.

Bug: 290856342
Test: manual - on DataUsageList
Test: unit test
Change-Id: I97e327a220d40942b9345ec7f1f8c466ac1fc9da
 2023-09-14 16:48:29 +08:00
Chaohui Wang
e4f5ac6b24 Clean up SettingsUnitTests unused dependencies 
Bug: 290856342
Test: atest SettingsUnitTests
Change-Id: Ifcec968b3dfca965c8cd5b897bbdf84dfe220fd5
 2023-09-14 15:59:59 +08:00
Milton Wu
2c114331aa Merge "[BiometricsV2] Ignore ui tests" into main 2023-09-14 05:59:41 +00:00
Hao Dong
26cd19552b Fix SettingsV2 tests. 
Test: atest FingerprintSettingsViewModelTest
Test: atest FingerprintSettingsNavigationViewModelTest
Bug: 300343752
Change-Id: Ib54da7a8839cecb16de65d20fce56248e6c60384
 2023-09-14 02:50:10 +00:00
Guojing Yuan
ac64ce5153 Merge "[CDM] Add Permissions Sync toggle" into main 2023-09-13 17:37:58 +00:00
Elliot Sisteron
8744e021e5 Handle "Blocked by your IT admin" better. 
Instead of allowing the user to click the entry, make the entry
non-clickable and mention that it's blocked by IT admin.

Bug: 297965563
Test: atest LockScreenSafetySourceTest
Change-Id: I821d661dd924358a5e7b033118b63e104ade9eaf
 2023-09-13 14:02:41 +00:00
Wentao Wang
f11e1666bf Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75 am: 0d3ae3ed32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: Ie89643b620ee82e4f30ab98ca466f54bd68b8067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 13:53:24 +00:00
Wentao Wang
0d3ae3ed32 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: I1c3d89346991f82f994a230db385ef2c523b067a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 13:01:39 +00:00
Wentao Wang
38f12abb75 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev 2023-09-13 11:51:21 +00:00
Wentao Wang
a44e75d6ed Separate the demo user factory reset option with admin user factory reset option. 
A security vulnerability was discovered by Android security. b/292548775 Within a short period of time after the device reboot, the user could enter the settings page and factory reset the device. Android Enterprise suggests to add DISALLOW_FACTORY_RESET user restriction to the device.

However, DISALLOW_FACTORY_RESET will be enabled on all Android users, including both the admin user and the demo user. The existing behavior in Android settings is that once the user restriction is set, factory reset button will be greyed out, which makes the factory reset functionality in demo user go away.

In demo user, the factory reset command will be forwarded to the current active device owner. So in this change, we separate the button for admin user and the button for demo user.

In demo user, the button is still visible when the restriction is set.

And in admin user, the button will be greyed out as expected.

Once this change is in, then Pixel Retail Demo could set the user restriction properly and rely on its internal logic to do factory reset. If other applications are trying to do the factory reset, it will be denied by OS.

BUG: 292548775
Change-Id: I9d2d47bb29bc2c1e05058b246908768cd2f95990
 2023-09-13 11:47:11 +00:00
mxyyiyi
6b8daefd54 Impl highlight effect on BatteryChartView slots. am: 6750634259 am: 9e4fed1b62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: I9a38284ab828c149ca06a51fbad7f3fcb2ac33de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 08:54:29 +00:00
Milton Wu
867df4287f [BiometricsV2] Ignore ui tests 
Ignore biometricsV2 UI tests

Bug: 299892647
Bug: 299894420
Bug: 299892667
Bug: 299892703
Bug: 299898688
Test: atest FingerprintEnrollmentActivityTest
Change-Id: If7aa509dbc0943aa53ffcc9d118ecc19e59b127f
 2023-09-13 08:37:44 +00:00
Graciela Putri
f862ff58f0 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 07:58:10 +00:00
mxyyiyi
9e4fed1b62 Impl highlight effect on BatteryChartView slots. am: 6750634259 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: Iff96ebb33e50b2c2bddbe44eada5bf35f7118531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 07:57:45 +00:00
Manish Singh
5aef6b6264 Remove temp workaround for feature flag 
Using the trunk stable feature flagging now.

Bug: 295516544
Test: m
Test: manual adb
Test: atest SafetySourceBroadcastReceiverTest
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I3d2d8c11dfb224ad2b09572493633366b4c4805c
 2023-09-13 08:49:56 +01:00
Graciela Putri
dd34fa54e4 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev 2023-09-13 07:14:13 +00:00
mxyyiyi
6750634259 Impl highlight effect on BatteryChartView slots. 
Screenshot: https://screenshot.googleplex.com/F5VrGjj5kdNHMV6

Bug: 284893240
Bug: 291689623
Test: manual
Change-Id: I846d95d31e8bb839481b86a94d5191ff205f8328
 2023-09-13 13:29:32 +08:00
YK Hung
9feaa3d883 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24545857

Change-Id: I29faff65657c84156d21d8e2bfc6ea285dbd5f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:45:21 +00:00
YK Hung
8596b78a00 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24663389

Change-Id: I89aa04fe2079243e78328177069bb16c1e8e5297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:43:40 +00:00
Zaiyue Xue
ea0f5b3d45 Refactor battery usage page contollers interaction logic 
(1) Move controllers interaction logic from BatteryChartPreferenceController to main page PowerUsageAdvanced.
(2) Move query power anomaly logic to DataProcessManager async job.

Bug: 284893240
Test: manual
Change-Id: Ib23b338fe3946e68ff73a372342ec5d86494c566
Merged-In: Ib23b338fe3946e68ff73a372342ec5d86494c566
 2023-09-13 03:56:28 +00:00
Hao Dong
0978271198 Remove FingerprintStateViewModel. 
Since FingerprintStateViewModel is too general as a view model, this CL
removes it and adds more concrete flows in FingerprintSettingsViewModel
and FingerprintEnrollViewModel.

Test: atest FingerprintManagerInteractorTest
Test: atest FingerprintSettingsViewModelTest
Test: Verified enroll/deletion/renaming/authentication flows on Settings

Change-Id: I3a0662195c4989de0813b92bccda9d36a7f7e32a
 2023-09-12 23:17:46 +00:00
Guojing Yuan
756d23cad1 [CDM] Add Permissions Sync toggle 
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
 2023-09-12 18:02:38 +00:00
Graciela Wissen Putri
c37c8b8789 Change aspect ratio summary and footer text 
Add more education for device user that setting aspect ratio has not
been tested by the app developer. Move Aspect ratio under Apps >
Advanced instead of General.

Fix: 296160724
Test: atest UserAspectRatioAppsPageProviderTest
Change-Id: I2078f285d7bfb8de3a61c69f9d0ff3872d683ed4
 2023-09-12 16:56:10 +00:00
mxyyiyi
19046965da Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2) 
- Remove unused flag is_battery_tips_feedback_enabled
- Update logic about is_battery_tips_enabled

Bug: 284893240
Bug: 291689623
Test: Manual
Change-Id: I826f517aa61e0c970048164706c4512ac3e0472d
Merged-In: I826f517aa61e0c970048164706c4512ac3e0472d
 2023-09-12 11:28:10 +00:00
Angela Wang
d84c60f2ac Merge "Fix test failure of AvailableMediaDeviceGroupControllerTest" into main 2023-09-12 06:06:08 +00:00
Chaohui Wang
5bf2981d08 Fix SettingsUITests flakiness 
Bug: 290684887
Test: atest SettingsUITests
Change-Id: I8f85c9c50eb3426b740c7ef3bf8996d6655bca0a
 2023-09-12 11:44:50 +08:00
Eric Rahm
802b922593 Revert "Test Fix SettingRobolectricTest Fail" 
This reverts commit 818f77cd1f.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
 2023-09-11 13:38:36 +00:00
Manish Singh
7cd9300c1d Merge "Add Private Space settings page" into main 2023-09-11 12:52:05 +00:00
Chaohui Wang
e2e0af282a Add DevelopmentSettingsTest 
Bug: 290684887
Test: atest SettingsUITests
Change-Id: I3acda74c96679fcdb531990848e456d5da0ae239
 2023-09-11 16:10:22 +08:00
Chaohui Wang
a35c6bc139 Fix more SettingsUITests 
Also add SettingsUITests to postsubmit.

Bug: 290381395
Test: ui test
Change-Id: Ib1dd35bf7823290bf77deb31366e9cb6ae9f65f7
 2023-09-09 22:02:56 +08:00
Becca Hughes
3915464217 Merge "Add missing divider to credman settings" into main 2023-09-08 23:36:07 +00:00
Angela Wang
bb1fe04afb Fix test failure of AvailableMediaDeviceGroupControllerTest 
Prevent test failing by avoid using ShadowFragment in the test. This
will cause `androidx.fragment.app.SuperNotCalledException` when creating
HearingAidPairingDialogFragment.

Bug: 299597695
Test: atest AvailableMediaDeviceGroupControllerTest
Change-Id: I99b5213cb78aad97fcb7e44e1babcf6c7f11636e
 2023-09-08 11:58:24 +00:00
Chaohui Wang
ce24ad65fe Merge "Fix some SettingsUITests" into main 2023-09-08 11:46:23 +00:00
Tetiana Meronyk
94b6aa45f7 Merge "Revert "Disable multiuser toggle when more than 1 user is created"" into main 2023-09-08 11:35:30 +00:00
Chaohui Wang
98ade3ae18 Merge "Clean up WifiDataUsageSummaryPreferenceController" into main 2023-09-08 08:03:18 +00:00
Chaohui Wang
1caab182a7 Fix some SettingsUITests 
Bug: 290381395
Test: atest AppsSettingsTests
Test: atest AppsSettingsRetainFilterTests
Test: atest AboutPhoneSettingsTests
Change-Id: I4c22afabbfc6ef5ed0e5fdcf86370ea0aaae5c74
 2023-09-08 15:48:29 +08:00