Ahaan Ugale
a4f81032f2
Merge "Update sensitiveNotificationAppProtection reference after move." into main
2024-02-14 19:40:32 +00:00
Bill Yi
09454f8635
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d59d3beebc4e0d05779836201fd704c4a5a62fc
2024-02-14 10:16:01 -08:00
Bill Yi
3d8af28675
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac69519b9a3a9023a16096ebcacec2e97b41cdc8
2024-02-14 10:14:30 -08:00
Bill Yi
ccabf894c1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibfe05bce22ad8ddee12426783d4c6a5c55706e1b
2024-02-14 10:11:49 -08:00
Becca Hughes
797694855f
Update button strings for new design
...
Updates the positive button strings see
mocks here:
https://screenshot.googleplex.com/6hLciwYTPMsYytt
https://screenshot.googleplex.com/ASAotxvEHnrDodq
Implementation:
https://hsv.googleplex.com/4658122816749568
https://hsv.googleplex.com/5590705238966272
Bug: 322074376
Change-Id: I8488d4b9414448bfbfc9462fe5450681bfbbfbdb
Test: flash device
2024-02-14 18:00:32 +00:00
Ronish Kalia
371c96cbc7
Merge "[DON'T BLOCK] Test ownership migration rules" into main
2024-02-14 17:03:46 +00:00
josephpv
cfbbc5e207
Update string Lock private space automatically
...
Screenshot : go/ss/A5CaxvsWijoydYV.png
Bug: 325180579
Test: Manual
Change-Id: I59a3518d607532c0a8ae4bac18b4dd0d40666041
2024-02-14 15:44:58 +00:00
Prabir Pradhan
c6f30c3eab
Merge "Fix StylusDevicesControllerTest after adding a stylus setting" into main
2024-02-14 15:00:09 +00:00
Ronish Kalia
4326b43cc3
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
<add g3 doc link>
Bug: 304529413
Test: N/A
Change-Id: I921e99879cf2be50bc0232d88c5bb2dfcbdc1123
2024-02-14 14:25:53 +00:00
Prabir Pradhan
c44fca064b
Fix StylusDevicesControllerTest after adding a stylus setting
...
When the build allows for pointer icons to be shown for styluses, a
third preference controller will be shown to toggle the pointer icon for
styluses.
Bug: 325014309
Test: atest StylusDevicesControllerTest
Change-Id: I0b4d2a9b19492fb8e4c8c904116ca763ca77cb8e
2024-02-14 04:20:57 +00:00
josephpv
dd57b93266
Change CHAR limit for localization query
...
Increase privatespace_search_description limit to 90 chars
Bug: 324559345
Test: Manual
Change-Id: I9b6b7c5a0a3391dea32192a3866fd531d93f5ce5
2024-02-13 20:48:45 +00:00
Joseph Vincent
13e570f104
Merge "Add illustration to final screen in PS setup and update existing illustrations." into main
2024-02-13 20:33:52 +00:00
Becca Hughes
7046a96c9a
Merge "Update "none selected" state to align with mocks:" into main
2024-02-13 20:15:18 +00:00
Becca Hughes
c627cdbdba
Hide "additional services" if there is only a single primary services
...
There is a case where there is a single primary service (e.g.
a fresh device) and we should hide additional services in that
case.
Test: unit + manual
Bug: 325077523
Change-Id: I9efb785ac3f7a328fdccd138e585f766d46fa282
2024-02-13 19:06:07 +00:00
Diya Bera
f7ffa201f4
Use parent profile for device credential
...
Flag: Flags.ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE
Bug: 320458435
Test: N/A
Change-Id: I9ee46d53df5f0617da643f1cf51db811a5eec478
2024-02-13 11:05:28 -08:00
Joshua McCloskey
d92faeb1cf
Adding more biometric screenshot tests
...
Test: atest FingerprintEnrollIntroScreenshotTest FingerprintEnrollFindSensorScreenshotTest FingerprintEnrollEnrollingScreenshotTest
Bug: 297083009
Change-Id: I11df6fbaefa9d333dcfe803577947a4be7af9882
2024-02-13 18:59:46 +00:00
Becca Hughes
5cbc60dcf3
Merge "Fix bug where maximum provider limit was not being reflected" into main
2024-02-13 18:52:59 +00:00
josephpv
e9f3a0925b
Add illustration to final screen in PS setup and update existing illustrations.
...
Screenshots:
- go/ss/9KhqUSezFKHnyys.png
Recording link:
- b/321694009#comment2
Bug: 323156268
Bug: 321694009
Test: Verified manually
Change-Id: Ib8abc080f31cad0a9be3b73a1694be744c108a06
2024-02-13 18:27:17 +00:00
Richard (Torne) Coles
c7138d9378
Merge "Use WebViewUpdateManager instead of raw AIDL." into main
2024-02-13 18:10:36 +00:00
josephpv
7ff2ab0df1
Update with latest icon in private space setup flow screens
...
Screenshots:
go/ss/9gaHk7iCpTVxi9S.png
go/ss/4s6vqq3RTvExK6b.png
go/ss/7uhBhrtU69E4SKv.png
go/ss/A3B98AiPBWPXtNA.png
Bug: 325043422
Test: Manual
Change-Id: I37b0707617287745239517a3113ef248f721c3f8
2024-02-13 15:02:20 +00:00
Chengfei Tao
d1618f94ff
Merge "SettingsGoogle: Add ContextualScreenTimeout" into main
2024-02-13 01:44:06 +00:00
Becca Hughes
f368299931
Fix bug where maximum provider limit was not being reflected
...
The limit of 5 providers had two issues, one it did not
reserve one slot for primary which meant that you could
enable 6 and also even though it wouldn't save and would
show an error when you hit that limit the toggle was not
reset which made it look like it was enabled.
Test: on device + unit
Bug: 324426504
Change-Id: Ibec4efd6394835729869194181161fe8ae743e76
2024-02-12 23:45:35 +00:00
Becca Hughes
6cca4f32e6
Update "none selected" state to align with mocks:
...
Mocks:
https://screenshot.googleplex.com/BYsmSRcRL5dhjve
Implementation:
https://hsv.googleplex.com/4797150908121088
Change-Id: I47e8f784fa850da4271170d44b3eb770721c3e8b
Test: on device & unit
Bug: 322074376
2024-02-12 23:29:27 +00:00
chengfeitao
ffb6e7e21b
SettingsGoogle: Add ContextualScreenTimeout
...
Store contextual screen timeout preference when the
corresponding switch is toggled.
Bug: 295232527
Test: atest ExternalSettingsProviderTest
Test: atest ContextualTimeoutPreferenceControllerTest
Change-Id: I093d180f4b11ebb806c4b1949ff5428520c8f40f
2024-02-12 23:14:40 +00:00
Treehugger Robot
aeeb9341a6
[automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: cca4e91fcf
-s ours am: 79bb73b651
-s ours
...
am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590
Change-Id: I90a652eb90479af34ec833b256441ea4d6cbe27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 22:55:55 +00:00
Aditya Choudhary
02e95ad210
[automerger skipped] [DON'T BLOCK] Test ownership migration rules am: 01735e6b40
-s ours am: 394bf6541d
-s ours
...
am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590
Change-Id: I87b8e58b4f1f08d82aa800fbbf10e3dd10b9b8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 22:55:49 +00:00
Treehugger Robot
79bb73b651
[automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: cca4e91fcf
-s ours
...
am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590
Change-Id: Idb929307456e59f885e1486227f3f6dce7b9d714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 22:02:29 +00:00
Aditya Choudhary
394bf6541d
[automerger skipped] [DON'T BLOCK] Test ownership migration rules am: 01735e6b40
-s ours
...
am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2950590
Change-Id: I8a5358be63fda69b82685b407c2019bd7919bb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 22:02:23 +00:00
Treehugger Robot
cca4e91fcf
Merge "[DON'T BLOCK] Test ownership migration rules" into main
2024-02-12 20:55:57 +00:00
Aditya Choudhary
b80f1ad5e3
[DON'T BLOCK] Test ownership migration rules am: 3f65505208
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26180899
Change-Id: I08536897cc394a67b10c42862cb9f4f2fb2696ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-12 19:33:21 +00:00
Ronish Kalia
902abe911d
Merge "[DON'T BLOCK] Test ownership migration rules" into main
2024-02-12 19:30:40 +00:00
Joshua Mccloskey
f06d5cf975
Merge "Updating navigation view model" into main
2024-02-12 18:39:56 +00:00
Ahaan Ugale
9507e30c5b
Update sensitiveNotificationAppProtection reference after move.
...
Bug: 309564730
Test: builds
Change-Id: I256eb8bd9e80a481ef1bffe22053f6fa668e5ee2
2024-02-12 18:21:00 +00:00
Oriol Prieto Gascó
6ceaa64fba
Merge "Set the container field of aconfig flags" into main
2024-02-12 16:42:12 +00:00
Manish Singh
26c9a6c6f9
Merge "Fix Apps storage page to show apps for selected user only" into main
2024-02-12 10:41:00 +00:00
josephpv
1e6e14c2c5
Add check to not show PS unlock message when activity is recreated
...
The condition added with this change makes sure the toast message is
shown only once and to not show duplicate toast evertime the activity
is recreated on screen rotation.
Recording link : b/324442522#comment2
Bug: 324442522
Test: Manual
Change-Id: I4e17384c1d02deacdd911195f014b0c8f1eb8833
2024-02-09 19:30:07 +00:00
Ravneet Dhanjal
50edf6755d
Merge "Add camera extension fallback toggle" into main
2024-02-09 19:26:12 +00:00
Aditya Choudhary
01735e6b40
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
go/new-android-ownership-model
Bug: 304529413
Test: N/A
Change-Id: I7fbd55a92f4302a6e03bcff0283737fd9295165d
Merged-In: I7fbd55a92f4302a6e03bcff0283737fd9295165d
2024-02-09 17:45:41 +00:00
Bill Yi
f7e54aab1f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-02-09 17:42:22 +00:00
Aditya Choudhary
4f5c1ac5bc
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
go/new-android-ownership-model
Bug: 304529413
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3f65505208d57fa18be353f815c44fdd6f004f4b )
Merged-In: I7fbd55a92f4302a6e03bcff0283737fd9295165d
Change-Id: I7fbd55a92f4302a6e03bcff0283737fd9295165d
2024-02-09 16:54:41 +00:00
Aditya Choudhary
3f65505208
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
go/new-android-ownership-model
Bug: 304529413
Test: N/A
Change-Id: I7fbd55a92f4302a6e03bcff0283737fd9295165d
2024-02-09 16:14:48 +00:00
Eran Messeri
8cff839cd7
Merge "Warn user when removing LSKF in the presence of auth-bound keys" into main
2024-02-09 13:05:18 +00:00
Manish Singh
8498f83141
Fix Apps storage page to show apps for selected user only
...
Currently only the personal and managed profile filters for the
respective profiles. And there's no filter to filter out the apps for
the private profile. This cl adds that filter and sets it for the
private profile user.
Bug: 317159160
Test: manual
Change-Id: Ia19171b1be73a061a598c2365c88e91ad2f8fec8
2024-02-09 11:29:58 +00:00
Yiling Chuang
cb33907736
Merge "Add a new tip type for wireless charging." into main
2024-02-09 03:44:37 +00:00
Treehugger Robot
2d84c6354b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 7102c78fcb
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26166251
Change-Id: I08ab13501cb9f18e1d04e5086297d50809e00f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-09 00:41:12 +00:00
Bill Yi
c71365c83b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ca22c2264
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26166251
Change-Id: I9637856a21900d133d870df877030065a1ede21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-09 00:40:58 +00:00
Treehugger Robot
7102c78fcb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-02-09 00:29:44 +00:00
Emilian Peev
1a56189eca
Add camera extension fallback toggle
...
Android camera extensions
(https://source.android.com/docs/core/camera/camerax-vendor-extensions )
will be able to use SW fallback implementations
on devices that do not ship the corresponding
the device specific functionality.
Since the SW fallback will be using a new data
path, it was suggested that users must be able to
control and enable/disable the SW fallback
via the Settings app.
Bug: 297083874
Test: atest packages/apps/Settings/tests/unit/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceControllerTest.java
Change-Id: I1b97777babe1c9f4ea4f2f6ee3d8251fea11146e
2024-02-09 00:07:05 +00:00
Treehugger Robot
8fbe7d0999
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 09a89e2771
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26167193
Change-Id: I059410533357526bc719967d31260dbe00e13697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:47 +00:00
Bill Yi
b562459996
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a11618f1e5
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26167193
Change-Id: Ie81aed76e26175fcb69cbe6484262f688f9ddb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-08 23:00:36 +00:00