Commit Graph

53548 Commits

Author SHA1 Message Date
Nino Jagar
65eb00f0f3 Integrate admin controls for content protection
Bug: 323038631
Test: End-to-end with TestDPC, new units
Change-Id: I98d52fdd95fca023b8eb576c97d563a1f3cab464
2024-03-07 22:56:09 +00:00
Sudheer Shanka
34bd0481df Merge "Remove the developer option to control Quarantine app state." into main 2024-03-07 19:39:55 +00:00
Liahav Eitan
0f37c7463b Fix Settings profile selector on HSUM
Currently Settings ProfileSelectorFragment uses isSystem() to identify
the personal user. This change migrates it to use isMain() in line with
HSUM architecture.

Test: atest SettingsRoboTests:com.android.settings.dashboard.profileselector.ProfileSelectFragmentTest
Fixes: 327610266, 327600527, 327585940, 326574736
Change-Id: I064b2fb295b89cffcd556e151fe1bf4484caf384
2024-03-07 14:41:07 +00:00
Chaohui Wang
4b0090700a Merge "Migrate the "Use this SIM" preference" into main 2024-03-07 12:43:52 +00:00
Graciela Wissen Putri
aed31bb8bd Follow config overlay's order of aspect ratio options am: a0f573a35e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26456385

Change-Id: I30ff221caba3be36834acb44958cf2aed30c17d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 12:11:14 +00:00
Olivier Nshimiye
b816437d39 Merge changes from topic "add-ps-features-flag" into main
* changes:
  Add Private Space features flag check to Settings tests
  Add an additional flag guard for Private Space implementation
2024-03-07 10:48:58 +00:00
Chaohui Wang
186629aad4 Migrate the "Use this SIM" preference
This will fix the toggle flicker issue.

Fix: 262179656
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ided2445034a83a8efc11dc97bab8719686d63712
2024-03-07 17:48:09 +08:00
Chaohui Wang
74fe516e09 Fix flicker of "App data usage"
Use placeholder to hold the place.

Fix: 323466366
Test: manual - on Mobile Settings
Test: unit test
Change-Id: I3c4d9ff6538a79500318869f01f4b88b55bd9475
2024-03-07 15:20:01 +08:00
Chaohui Wang
c038d58bef Merge "Sort the selectable subscription by id" into main 2024-03-07 06:40:34 +00:00
SongFerng Wang
eb80786be3 Merge "Add the mechanism of enable DSDS" into main 2024-03-07 04:33:37 +00:00
Wilson Wu
4406de67e0 Merge "Add fixed amplitude check for keyboard vibration" into main 2024-03-07 04:30:36 +00:00
Chaohui Wang
ad611366df Sort the selectable subscription by id
To make sure users always see a fixed order.

Bug: 318310357
Test: manual - on SIMs and turn on / off SIM
Change-Id: I2910d83f5b1d04287afca0e3ba91dedbeb588c14
2024-03-07 11:23:25 +08:00
Chaohui Wang
bdfae3a3bf Merge "Create NetworkScanRepository" into main 2024-03-07 02:47:30 +00:00
Chaohui Wang
51c78ff199 Merge "Update the summary when Wi-Fi calling ready" into main 2024-03-07 02:46:43 +00:00
Treehugger Robot
1b3c21ef1b Merge "Fixed NPE in FingerprintEnrollIntro" into main 2024-03-07 02:24:40 +00:00
Jacky Wang
5847d50e7b [DataStore] Support backup data state computation
Bug: 325144964
Test: Manual tests
Change-Id: I8ad4f2788f9f364eceb1bca841830e1f3a68fe77
2024-03-07 10:03:19 +08:00
Joshua McCloskey
3c57fcde32 Fixed NPE in FingerprintEnrollIntro
Test: atest FingerprintEnrollIntroductionTest
Fixes: 317515741
Change-Id: Icc4e5cd4fbfea6828684ce6c8fc30acaabe5d315
2024-03-07 00:33:49 +00:00
songferngwang
2b5002ae6a Add the mechanism of enable DSDS
When the user click the "set up" on sim onboarding BottomSheet, settings
enable the DSDS mode and then start the sim onboarding flow

Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: build pass and verify the UI flow
Change-Id: Ibd4fc2f482019f02738c3fedef7af7f4ef9b8e50
2024-03-06 23:01:48 +00:00
Chun-Ku Lin
8b67c17a7b Show QS shortcut option if the a11y feature provides a tile.
Bug: 314852953
Test: atest com.android.settings.accessibility
Test: atest com.android.settings.accessibility.shortcuts
Test: manual
Flag: ACONFIG android.view.accessibility.a11y_qs_shortcut STAGING
Change-Id: Id7a6b3adfd4c4f3cb2b9f7fe15269b57a3d00543
2024-03-06 20:26:28 +00:00
Manish Singh
eb840e23f7 Merge "Return the correct position for the profile tab" into main 2024-03-06 19:33:41 +00:00
Wilson Wu
fd45101eee Add fixed amplitude check for keyboard vibration
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.

Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-06 12:33:07 +00:00
mpodolian
c43f10f32a Updated bubble setting design according to b/284170911.
Updated bubbles settings screen design.

Test: manual
Bug: 284170911
Change-Id: Ie28ffca28820fe45b11fecfa735ce39aeddcba02
2024-03-06 12:11:42 +00:00
Jacky Wang
23821a69f3 [DataStore] Support backup data with compression
Bug: 325144964
Test: Manual tests
Change-Id: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b
2024-03-06 19:51:55 +08:00
Jacky Wang
cc0a94d732 [DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage
Bug: 325144964
Test: Manual tests
Change-Id: I195ee91f29030fcfe7176ed0c18fb2e2d0d40257
2024-03-06 14:44:04 +08:00
Sudheer Shanka
07251c8262 Remove the developer option to control Quarantine app state.
Bug: 305256093
Test: manual
Change-Id: I28cfb3f1e6c5d3bdab77b7eae2262a03909c45f7
2024-03-06 06:02:38 +00:00
Chaohui Wang
d48cf866d8 Update the summary when Wi-Fi calling ready
Since the correct summary can only be got after Wi-Fi calling ready.

Fix: 325414275
Test: manual - on Mobile Settings
Change-Id: Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27
2024-03-06 12:44:22 +08:00
Manish Singh
8ca4f47292 Return the correct position for the profile tab
The existing code returns the fixed tab values, which doesn't work
now that the ordering is determined by the user manager's ordering.

Bug: 302278487
Test: manual
Test: atest ProfileSelectFragmentTest
Change-Id: I87b393b8e12e21dc1b38ee75bb43ca9133785c81
2024-03-05 19:50:29 +00:00
Isaac Chai
46369353ed Adding Settings preference for single finger panning feature
Test: Locally tested on device +
MagnificationOneFingerPanningPreferenceControllerTest
Bug: 282039824

Change-Id: I1d1a649060cba862c8f333e6e76184fade2dcdce
2024-03-05 19:10:59 +00:00
Manish Singh
ea341bdf98 Merge "Add controller for location for private profile" into main 2024-03-05 18:48:35 +00:00
Graciela Wissen Putri
a0f573a35e Follow config overlay's order of aspect ratio options
Fix flaky UserAspectRatioAppsPageProviderTest by using advanceUntilIdle
to make sure all coroutines are finished before asserting.

Bug: 325911424
Test: atest UserAspectRatioDetailsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32815ad699448c5c5b1f38df6d2d2a881d4251c1)
Merged-In: I83e9a7f31536c1a006789722b0310f3364d14337
Change-Id: I83e9a7f31536c1a006789722b0310f3364d14337
2024-03-05 17:11:59 +00:00
Harry Cutts
f8ffe79669 Touchpad: add metric for tap dragging setting changes
Bug: 321978150
Bug: 324058706
Test: $ m statsd_testdrive
      $ ./out/host/linux-x86/bin/statsd_testdrive -e 97
      Then toggle the setting, press Enter in the terminal, and check
      the new actions are logged
Change-Id: I55b7cc3377e7b27e9570f3f1b79c1f300d5d5686
2024-03-05 16:59:33 +00:00
Matías Hernández
65e6431ec5 Merge "Moved zen-conversion-related methods into ZenAdapters" into main 2024-03-05 16:52:03 +00:00
Manish Singh
dd5a8e610c Add controller for location for private profile
Bug: 303196278
Test: manual
Change-Id: I0997918e5046ac803c2c2d117c2e027b4aacc2c2
2024-03-05 16:27:28 +00:00
Treehugger Robot
d89636390f Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93 am: 887741ee49
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352

Change-Id: I329e07a9a27327d967a9c8de34531f33c847a74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 16:04:15 +00:00
David Liu
710b4cdcbe Merge "Fix toolbar keyboard navigation and touch." into main 2024-03-05 16:04:08 +00:00
Treehugger Robot
887741ee49 Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352

Change-Id: I309e4d56dc379680d07bf1e28648ca620b824bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 15:22:33 +00:00
Treehugger Robot
dee4388b93 Merge "[Thread] fix wrong kotlin argument name" into main 2024-03-05 14:31:02 +00:00
Chaohui Wang
4dbc23ca28 Create NetworkScanRepository
And migrate network scan to flow for better maintenance and prevent ANR.

Fix: 323105271
Test: manual - Choose network
Test: unit test
Change-Id: I5c49d195fc202143c0131ffd78bc3adc168b119c
2024-03-05 21:45:18 +08:00
Harry Cutts
175a901f2c Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd am: 3c1a5bb3c0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053

Change-Id: Ifae971d2fd89374e8e0c1d3a147c6390a85dee46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 12:45:49 +00:00
Harry Cutts
3c1a5bb3c0 Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053

Change-Id: Idf76ff1bf592de800d224052910927285c47c42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 12:05:02 +00:00
Harry Cutts
01bd498503 Merge changes I0c0a76c7,Iccfbe842 into main
* changes:
  Touchpad: remove icons
  Touchpad: add tap dragging setting
2024-03-05 11:39:22 +00:00
Harry Cutts
a3a04112fd Merge "Touchpad: add Framework Input team as owners" into main 2024-03-05 11:17:46 +00:00
Vaibhav Devmurari
d3dbe6ce23 Merge "Modify PK Settings page to make it more user friendly" into main 2024-03-05 10:53:48 +00:00
Anna Zhuravleva
a05ba46acd Merge "Log change in autolock settings" into main 2024-03-05 10:18:58 +00:00
Simon Wingrove
6fbec88456 Merge "Prevent full-screen face enroll on tablet" into main 2024-03-05 09:56:38 +00:00
Manish Singh
0d1d483d7c Merge "Return true only if the userManager belongs to private profile" into main 2024-03-05 09:46:40 +00:00
Riley Jones
ee25100639 Merge "Change EditShortcutsPreferenceFragment to use a Preference for subtitle/description" into main 2024-03-05 02:53:47 +00:00
Roy Chou
79ee7bc941 Merge "chore(magnification): remove onResume overrides for controllers in ToggleScreenMagnificationPreferenceFragment" into main 2024-03-05 01:32:33 +00:00
Riley Jones
f8237aee94 Change EditShortcutsPreferenceFragment to use a Preference for subtitle/description
Replaces PreferenceCategory with unselectable Preference to better match desired visuals

Screenshot at https://x20web.corp.google.com/users/jo/jonesriley/dragToEdit/editScreenWithSubtitle.png

Flag: N/A
Test: N/A
Bug: 323388734
Change-Id: Ia1b333bc246ea4dd98070a646d5a8a1716ccbcee
2024-03-04 22:45:11 +00:00
Manish Singh
55e9f41bda Return true only if the userManager belongs to private profile
The existing code asks the main user's userManager if there's a
private profile belonging to it. If a private profile exists then the
answer to that question will always be true. So, we always end up
showing the apps from the private profile for the personal case.

We should instead ask the userManager if it belongs to the private
profile or not.

Bug: 327598131
Test: manual
Change-Id: I7bc9d58c371341235579d3456b54ea85f598892b
2024-03-04 18:26:58 +00:00