Commit Graph

16613 Commits

Author SHA1 Message Date
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
Guojing Yuan
ac64ce5153 Merge "[CDM] Add Permissions Sync toggle" into main 2023-09-13 17:37:58 +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
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
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
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
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
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
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
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
Tetiana Meronyk
8489ae99dc Revert "Disable multiuser toggle when more than 1 user is created"
Revert submission 24420426-multi_toggle

Reason for revert: This change needs to be done along with some other UI changes to avoid confusion

Reverted changes: /q/submissionid:24420426-multi_toggle

Change-Id: Ife2e03d0090fefcb4c1fa53dd007336759eb1bc7
2023-09-07 15:50:09 +00:00
Shivangi Dubey
00a78fca41 Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953

Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 15:06:39 +00:00
Zaiyue Xue
c192039fe5 Merge "Refactor battery usage page contollers interaction logic" into main 2023-09-06 11:46:09 +00:00
dshivangi
7435bbc70a Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-06 10:52:12 +00:00
Shivangi Dubey
25825c8329 Merge "Refine fold setting" into main 2023-09-06 10:47:31 +00:00
Zaiyue Xue
f5ea50e20e 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-06 17:51:02 +08:00
Chaohui Wang
4b686147b6 Clean up WifiDataUsageSummaryPreferenceController
Which is legacy and not finished implemented.

Bug: 295260929
Test: unit test
Test: robo test
Test: manual - on Mobile Settings page
Test: manual - on Network details page
Change-Id: I30ac639c1ba285a74038d5413b63e2c31c6cc8ba
2023-09-06 17:37:02 +08:00
mxyyiyi
2c0242bed3 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
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:24e269dd0a63b5cb98fec791708cfe294b5aa47c)
Change-Id: I826f517aa61e0c970048164706c4512ac3e0472d
2023-09-05 17:48:18 +00:00
Angela Wang
873936451c Merge "Redirect user to original pairing page from pair dialog" into main 2023-09-05 07:08:16 +00:00
SongFerng Wang
4f4a1e3037 Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev am: 60afc1259f am: 33b6032bb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24575008

Change-Id: I192fa19976ca932cabbf744915f6e4568ca391ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 03:44:34 +00:00
SongFerng Wang
33b6032bb2 Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev am: 60afc1259f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24575008

Change-Id: I2214f91f8f27ab937b2d9b96f62a1fdcdae47072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 02:49:28 +00:00
SongFerng Wang
60afc1259f Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev 2023-09-05 01:55:45 +00:00
Trina
c17809f03b Sync the charge time with battery info on settings
Test: atest SettingsTests

Bug: 296793655
Change-Id: I407de30589e77ba09916f54f06f4f9c345adf330
2023-09-04 14:32:49 +00:00
Chaohui Wang
a9a819a5d7 Merge "Remove duplicated metered & privacy spinner" into main 2023-09-04 11:04:46 +00:00
Chaohui Wang
0d129f77f0 Remove duplicated metered & privacy spinner
From Wi-Fi dialog when there are already same settings in the Wi-Fi
detail page.
This makes simpler for the user and help fix the inconsistent issue.

Fix: 297036035
Test: manual - open Wi-Fi dialog from Wi-Fi detail page
Test: robo test
Change-Id: Ic02658d91938db78b91e867a923260aa2610ae49
2023-09-04 17:10:17 +08:00
Yiyi Shen
a82c257002 Merge "Add a new section to show eligible Fast Pair devices." into main 2023-09-04 08:25:11 +00:00
Kean Mariotti
4ed4885aa8 Merge "Revert^2 Remove Winscope tracing QS development tile" into main 2023-09-04 07:50:36 +00:00
Yiyi Shen
71d9c21856 Add a new section to show eligible Fast Pair devices.
The section only show at most 3 devices. If the device list size is
greater than 3, we will show a "See all".
The device Preference is ordered. FastPairDeviceUpdater will handle the
order logic.
Bug: 296507968
Test: FastPairDevicePreferenceControllerTest

Change-Id: I9692d5740dbc31ff50db0ebbf2c5535b726277c9
2023-09-04 11:32:32 +08:00
Holly Jiuyu Sun
80e4a5134a Merge "Move ShadownDeviceConfig.java to tests/robotests/testutils." into main 2023-09-01 15:32:36 +00:00
dshivangi
dc485887cc Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-01 14:43:22 +00:00
Chaohui Wang
83cf8dbadc Merge "Clean up deprecated WifiSettings" into main 2023-09-01 10:49:03 +00:00
Kean Mariotti
95b375e2b4 Revert^2 Remove Winscope tracing QS development tile
This commit removes the obsolete QS development tile for Winscope
tracing as now Winscope traces can be collected via Traceur.

Bug: 295816837
Test: N/A
Change-Id: I7658537579cd054af092945aab553a4e17997273
2023-09-01 10:36:29 +00:00
Treehugger Robot
38bb07beb7 Merge "Fix b/298551473: Battery usage robotest failed in main branch" into main 2023-09-01 10:06:47 +00:00
Xinyi Mao
5bad30b3db Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148 am: 428b124bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I147d8496db00a770d8de45229813ae146e1e87cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 09:54:53 +00:00
Xinyi Mao
428b124bea Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I7068d880ab644f01dba523132dbccd2cc6ceff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 08:59:18 +00:00
Xinyi Mao
c51a3da148 Merge "Impl app anomlay preference" into udc-qpr-dev 2023-09-01 07:53:09 +00:00
mxyyiyi
c4fb17d740 Impl app anomlay preference
[ScreenShot]: https://screenshot.googleplex.com/BBrHTQbwbFHxZE9

Bug: 291689623
Bug: 291689643
Test: manual
Change-Id: Ia257f3ace4a2d71b2221f861be3e1238de6d791e
2023-09-01 06:40:36 +00:00
Allen Su
f8be5736a8 Merge "Add feature flag for LocaleNotification" into main 2023-09-01 05:30:03 +00:00
Chaohui Wang
6e7b06f18e Clean up deprecated WifiSettings
Replace all references to NetworkProviderSettings.

Bug: 297036035
Test: robo test
Test: manual - on internet settings
Change-Id: I2a5ae5644042c982c2a284a303257896c20b7714
2023-09-01 13:24:29 +08:00
Chaohui Wang
ca4e47c348 Merge "Migrate WifiDialog2 to Kotlin" into main 2023-09-01 05:19:39 +00:00
Allen Su
ac54b70c85 Add feature flag for LocaleNotification
Bug: 248514263
Test: atest AppLocalePickerActivityTest LocaleListEditorTest
Change-Id: I0e2160d75bbac83a161c73c90624b0e7af5b0a8e
2023-09-01 03:24:58 +00:00