josephpv
f145d0e9a0
Update illustrations in Private Space setup & settings
...
This inlcudes the changes to use latest private space icon and update
the illustrations in private space setup and settings.
Change made to update illustrations dynamically between light and dark
theme.
Recordings link:
b/332867167#comment3
Bug: 332867167
Test: Manual
Change-Id: I6387c9991ec9bb419f446431926f99843f92c859
2024-04-09 22:35:04 +00:00
josephpv
af800e55f4
Replace autoadvance screens with waiting screen in PS setup
...
This change replaces the auto advancing screens shown during private
space setup flow with a single loading screen.
Recording: b/332652637#comment3
Bug: 332652637
Test: Manual
Change-Id: I470e5c6ece16cfefd0734d3daadf1d8efe963f63
2024-04-09 21:13:37 +00:00
Joseph Vincent
727ec97362
Merge "Fix for test failure in PrivateSpaceMaintainerTest" into main
2024-04-04 11:10:12 +00:00
josephpv
1108e206f4
Fix for test failure in PrivateSpaceMaintainerTest
...
Bug: 332488382
Test: atest PrivateSpaceMaintainerTest
Change-Id: Id6a18305f03f45c580ada482a352d1d7ad3dd788
2024-04-03 22:23:05 +00:00
josephpv
4e32375f3d
Use canAddPrivateProfile() to enable PS delete from Reset
...
This change adds canAddPrivateProfile() check to enable/disable
Private space delete controller in Reset options.
Matches the availability to delete private space from reset
options with the conditions used to show the private space entry point.
In Settings Reset options preference to delete private space will be
shown only when private space creation is allowed on the device or if
private space already exists on the device.
Bug: 330396315
Test: ResetOptionsDeletePrivateSpaceControllerTest
Change-Id: I63232556f7927aeb07b73e8732bbb8b1d2423456
2024-04-03 20:39:12 +00:00
Becca Hughes
bc48abe0bd
Merge "Update title of settings page to reflect updated mocks" into main
2024-04-03 18:21:17 +00:00
Joseph Vincent
bc61497448
Merge "Revert^2 "Add waiting screen before PS setup completion"" into main
2024-04-03 17:41:52 +00:00
Becca Hughes
6eb971c80f
Merge "Pass the package name from the intent to the picker fragment" into main
2024-04-03 17:23:49 +00:00
Joseph Vincent
0fee5fa0b0
Revert^2 "Add waiting screen before PS setup completion"
...
This reverts commit d2c91b587e
.
Reason for revert: Landing the original cl as the test passes locally with changes and failed test looks to be flaky and not related to the change.
Failure is not seen in the ABTD test run results with this CL b/331935387#comment10
Change-Id: I744e11a04b70e265c5dcfe5aa8db7237561f3a08
2024-04-03 16:36:21 +00:00
Harry Cutts
46e5fd8c28
Touchpad: add final strings for tap dragging
...
The title string was approved by UX as it is, so mark it as ready to
translate, and add a summary line.
Screenshot: go/b-324058706-strings-screenshot
Bug: 324058706
Bug: 321978150
Change-Id: Iaa757be16b58b23fba8a6841621ad8000b51c250
Test: Open touchpad settings, check new summary line appears
2024-04-03 14:27:42 +00:00
Chaohui Wang
9cfbe60998
Merge "Use SpaDialogWindowTypeActivity for WEP dialog" into main
2024-04-03 09:07:53 +00:00
Treehugger Robot
cdd9b78e22
Merge "Restrict WifiDppConfiguratorActivity" into main
2024-04-03 08:18:15 +00:00
Yi Shiou (Les) Lee
c310438a82
Merge "wifi: Using framework uri parsing" into main
2024-04-03 07:58:52 +00:00
Chaohui Wang
51a4bea7d9
Use SpaDialogWindowTypeActivity for WEP dialog
...
TODO: Set different window type when called from Quick Settings.
Bug: 332643450
Test: am start -n com.android.settings/.network.WepNetworkDialogActivity
Change-Id: Ie888e7cc116234199316b030fb5f35dea6dbb3ac
2024-04-03 15:26:26 +08:00
Samuel Huang
854785bebb
[automerger skipped] Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev am: 9c5ce0172f
-s ours
...
am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f35
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784704
Change-Id: I869538899dd5271eb93f7a75dfffa3fa5bc7d38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-03 05:05:50 +00:00
Samuel Huang
a06c66622a
[automerger skipped] Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook am: c6e13c10c4
-s ours
...
am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f35
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784704
Change-Id: I3e0be83aa9e0d72ca5b41713030f91e9dde3d6e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-03 05:05:44 +00:00
Les Lee
1635951de2
wifi: Using framework uri parsing
...
Bug: 298669190
Test: Manual test. Qr code sacnning works normally.
Change-Id: I8e6138971ae6798b42db32930f80e9113a8c0223
2024-04-03 04:59:22 +00:00
Samuel Huang
9c5ce0172f
Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev
2024-04-03 04:48:24 +00:00
Chaohui Wang
43ce1c4abf
Merge "Correct the data usage warning" into main
2024-04-03 03:38:07 +00:00
Jason Chang
edb0ff11e1
Merge "Fix face unlock setup page is abnormal" into 24D1-dev am: d245c1108a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784347
Change-Id: Iaa927a8b3f6df29d634bfb6baacdb96aeb415899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-03 03:25:00 +00:00
Jason Chang
d245c1108a
Merge "Fix face unlock setup page is abnormal" into 24D1-dev
2024-04-03 03:14:13 +00:00
Weng Su
2101258e8a
Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 10:45:43 +08:00
Treehugger Robot
f6c7511996
Merge "[Settings] fix Settings crash on App info for archived apps" into main
2024-04-03 00:14:45 +00:00
Hakjun Choi
0c2927a234
Merge "Make satellite more info url carrier configurable" into 24D1-dev am: df0ea6c723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26684988
Change-Id: I274e82a7cd279625ceb9ddda8442bbaf3d746ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 23:19:43 +00:00
Hakjun Choi
df0ea6c723
Merge "Make satellite more info url carrier configurable" into 24D1-dev
2024-04-02 23:03:24 +00:00
Marcus Ge
c3f57aa3ba
Merge "[Accessibility] Restore high contrast text" into main
2024-04-02 22:57:40 +00:00
Songchun Fan
faeaa7650e
[Settings] fix Settings crash on App info for archived apps
...
For archived apps, isClearRestrictionAllowed (introduced in ag/26048774)
can throw NameNotFoundException, which causes Settings app to crash if
uncaught. This CL fixes that.
Test: manual by archiving an app and then try to go to it's app info
page
BUG: 332397754
Change-Id: I49a39dba36261f36215f0389ffe41523e8a2f4e8
2024-04-02 22:09:57 +00:00
Joshua Mccloskey
90552bb255
Merge "Removed period from fp delete dialog." into main
2024-04-02 19:24:08 +00:00
Bill Yi
06466ee253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: d52215885e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793743
Change-Id: I0c6116b55005219f33e7533a0aa391e74334db60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 19:04:40 +00:00
Bill Yi
1449377090
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb74a16786
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793743
Change-Id: I874d98fe1e9c3b1e8295ff481784c7ddb8a47434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 19:04:27 +00:00
Bill Yi
d52215885e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-04-02 18:47:09 +00:00
Joshua Mccloskey
398b73a9fb
Merge "UDFPS Enrollment refactor (3/N)" into main
2024-04-02 18:20:03 +00:00
Joshua McCloskey
4a499bb9b2
Removed period from fp delete dialog.
...
Note that this removes the period from english & all translations,
DeleteFingerprintDialog & ConfirmLastDeleteDialog should be the same.
Test: Manual.
Fixes: 331758381
Change-Id: I774375ed575bfdfd3ec181d902a99d918596890c
2024-04-02 18:10:05 +00:00
Kyle Zhang
9c0ad21257
Merge "Allow CDM version v19 or later" into main
2024-04-02 17:58:25 +00:00
Becca Hughes
13c6b07868
Pass the package name from the intent to the picker fragment
...
When an app uses the legacy autofill intent to launch the
settings activity we should pass the package name of the
launching app to the picker. If the app is then picked by
the user we will return result_ok to the app and if it
is not picked we will return result_cancel.
Change-Id: I99dbfad2c69ed57ff891c189f726ecc408d9d188
Test: ondevice manual
Bug: 324197609
2024-04-02 17:53:30 +00:00
Treehugger Robot
b8aae0edad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2244c6296f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793987
Change-Id: Ic63de969166c57b18862045395f59b9566730355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 16:55:44 +00:00
Bill Yi
4464313c9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d0769751a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793987
Change-Id: If21390190b16fd7107954bab0f3bc6ea08309bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 16:55:29 +00:00
Treehugger Robot
6571fe1f2a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b7b1943428
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793971
Change-Id: I70dd865af37f1e19754c72c10ade0bd02771121d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 16:55:26 +00:00
Bill Yi
a88924aee1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5741c891a4
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793971
Change-Id: I6b8188e862ae1eb7e35ad246fbbf3b6e001e38f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 16:55:22 +00:00
Bill Yi
6f13e84083
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b53bbda642
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793967
Change-Id: If23979d694c617f87ed03614838996d758f17df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 16:55:14 +00:00
Bill Yi
0a444d4d83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d947dfd61
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26793406
Change-Id: I92fd6c1c8e71349fecaadc1ac90da09f002c6899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-02 16:45:26 +00:00
Treehugger Robot
2244c6296f
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-02 16:40:12 +00:00
Treehugger Robot
b7b1943428
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-02 16:40:12 +00:00
Treehugger Robot
bec80ea502
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-02 16:34:08 +00:00
Treehugger Robot
0d4027afdf
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-02 16:34:08 +00:00
Treehugger Robot
ffc3fef29a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-02 16:34:08 +00:00
Rafael Higuera Silva
1bf1b02c31
Merge "Add new warning dialogue when user is Resetting mobile network settings." into main
2024-04-02 16:26:20 +00:00
Treehugger Robot
6c3f348f87
Merge "Use disabled summary when trustagents are disabled" into main
2024-04-02 15:35:58 +00:00
Treehugger Robot
a9f137842a
Merge "Fix MobileNetworkSettings kotlin.UninitializedPropertyAccessException" into main
2024-04-02 12:12:11 +00:00
Xinyi Mao
9db553f264
Merge changes from topic "screentime" into main
...
* changes:
Fix summary for system components which 30 sec <= usage time < 1 min.
Fix purge condition for system component in BatteryDiffData.
2024-04-02 10:59:14 +00:00