Joseph Vincent
83b2d86ff5
Merge "Check config to Show/Hide Private space Hide Illustration" into main
2024-07-23 21:41:17 +00:00
Matías Hernández
6a5e7b9631
Merge "Changes to the trigger segment" into main
2024-07-23 20:02:56 +00:00
Daniel Norman
914643da7d
Merge "Checks that prebundled categories contain only preinstalled contents." into main
2024-07-23 19:14:59 +00:00
Matías Hernández
9e2ac046e4
Changes to the trigger segment
...
* Switch is always visible, even without a configuration activity
* Custom icon, title, and summary for some mode types (such as SCHEDULE_TIME, etc).
* Default texts in case of missing trigger description.
* Different icons for having/missing configuration activity.
* Move the section to the top of the screen.
Bug: 349376785
Test: atest ZenModeTriggerLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: I960318899cf4da20ffc5765818429d5790d05067
2024-07-23 18:14:34 +02:00
YK Hung
ba11a4246a
Merge "Ignore broadcast intent from additional profile." into main
2024-07-23 15:35:46 +00:00
mxyyiyi
d4965bd5cc
Ignore broadcast intent from additional profile.
...
- Use isAdditionalProfile() to ignore intent from either work or private profile.
Bug: 354828134
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: Ic0c91d956e4bfcd53576629efab4be847c94155e
2024-07-23 19:31:05 +08:00
josephpv
f5d279c9a2
Check config to Show/Hide Private space Hide Illustration
...
Enable/disable the search tile content and hide illustration
in Hide Private Space Settings page based on the config value.
By default the config value is set to true which will be used in Pixel
to show the illustration and search tile content.
OEM can set value of config_enableSearchTileHideIllustrationInPrivateSpace in the device
overlay file to false to disable it and with this change it is taken
care to hide them if the config value is false
Screenshot:
go/ss/56WxtgXd5NSqVFm.png
Bug: 346612477
Test: Manual
Flag: android.multiuser.private_space_search_illustration_config
Change-Id: Ia9fbdebd9a220f4d995369d662a75989f07a2916
2024-07-23 10:25:20 +00:00
Treehugger Robot
ad105f6e17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 4fd09ec261
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28441382
Change-Id: Ic1688157c157db610c3fa2a819d7d43c7f59e4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:20:42 +00:00
Bill Yi
0800707ba6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7e0d7b1a6
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28441382
Change-Id: I7c93ee89f3f999e32ff857dedc90f6fb8f0fa4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:20:38 +00:00
Treehugger Robot
b2c1fc34bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: dc1e74fd93
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28440135
Change-Id: Ic54b98b08fea9ab35d820ca83ef4394c9b67b18a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:20:36 +00:00
Bill Yi
62f0503e44
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5e4ae0a80
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28440135
Change-Id: I64235cb69e8dc56181dc0aae98c954f5a5356e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:20:31 +00:00
Bill Yi
14eb5c3968
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6173c8acb7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28433460
Change-Id: If19f47c6fd7f002d79a6861bcd77fedc804d7ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:20:18 +00:00
Treehugger Robot
0bd9bd7607
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 7c78a90387
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28433457
Change-Id: I9271d92bbafc8f58e39935393761aa131037074a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:06:44 +00:00
Bill Yi
c3232dd6ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ac305bdc5
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28433457
Change-Id: Ib1b4ff49ca90f5b21e011af720d1de8d6af7bd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:06:34 +00:00
Bill Yi
7c7cd1be3a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a8dff19ac
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28433456
Change-Id: I571505bd98721cde03a5405512b155d6b704ab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 09:06:13 +00:00
Treehugger Robot
4fd09ec261
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-23 08:53:49 +00:00
Treehugger Robot
dc1e74fd93
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-23 08:53:49 +00:00
Treehugger Robot
7c78a90387
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-23 08:53:37 +00:00
Treehugger Robot
b761f43fd2
Merge "Add mandatory biometric prompt to platform surfaces (3/N)" into main
2024-07-23 05:20:19 +00:00
Bill Yi
b7e0d7b1a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I16f5cb6e083adbaff08eea7d1af65272e283a323
2024-07-22 21:25:22 -07:00
Bill Yi
6173c8acb7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id62f40843994cc42fe3d8a4209d7907351cb483d
2024-07-22 21:22:02 -07:00
Bill Yi
d5e4ae0a80
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3165dc060f3b2334b94fc557fc9ce6a817f24d72
2024-07-22 21:18:27 -07:00
Bill Yi
6ac305bdc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I781749a47677cef224c9aa79c1333374a2e86fe8
2024-07-22 21:15:58 -07:00
Bill Yi
6a8dff19ac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic7a3ed2076e279e5b23f5f069a95381ca70e0ccb
2024-07-22 21:14:33 -07:00
Diya Bera
9bae71c15c
Add mandatory biometric prompt to platform surfaces (3/N)
...
Pass user ids for identity check. This is to make sure that the right
user is requested auth for different profiles.
Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest UtilsTest
Change-Id: I953b56e9bfd1edd49d080124905d42a23247b7a7
2024-07-23 04:07:08 +00:00
Chelsea Hao
7a01fb2679
Merge changes Ibb68252c,Ide20e07f,I5d2e2c70 into main
...
* changes:
Add accessibility label for "QR code" scanner. Also added landscape mode.
Add accessibility label for "QR code" image. Also added landscape mode.
Add accessibility label for "QR code" button in Audio sharing page.
2024-07-23 02:52:11 +00:00
Treehugger Robot
6aac1cba28
Merge "Clean up BT stack log level preference controller and tests" into main
2024-07-23 02:45:25 +00:00
Haijie Hong
8b2d520221
Merge "Update color of ring battery indicator" into main
2024-07-23 02:29:35 +00:00
Ram Peri
34152fae41
Merge "Robolectric upgrade" into main am: 71b2be5571
am: 119d1e9f43
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301
Change-Id: Ide8c2fe010260f3ae172c0b2537d6d879212b333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 01:25:50 +00:00
Ram Peri
119d1e9f43
Merge "Robolectric upgrade" into main am: 71b2be5571
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301
Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 01:08:54 +00:00
Pajace Chen
7ec1355922
Merge "[BugFix] Fix the incorrect state for dockdefend on battery settings page" into main
2024-07-23 00:37:13 +00:00
Ram Peri
71b2be5571
Merge "Robolectric upgrade" into main
2024-07-23 00:28:56 +00:00
Isaac Chai
8b1135e1c9
Merge "feat(color correction): Disable slider when not applicable" into main
2024-07-22 22:43:39 +00:00
Daniel Norman
20d2eabe35
Checks that prebundled categories contain only preinstalled contents.
...
Bug: 353888087
Test: atest AccessibilitySettingsTest
Test: manually check all prebundled services are still in their proper
groups, even after installing an APK update
Flag: com.android.settings.accessibility.check_prebundled_is_preinstalled
Change-Id: I023db9c37d7990deb50c9eec516619f0a8db65b7
2024-07-22 21:42:59 +00:00
Isaac Chai
581fbc8dfa
feat(color correction): Disable slider when not applicable
...
We received feedback that slider should be disabled when it's not
applicable, namely when it's off and when mode == gray scale.
Bug: 351920992
Test: Locally tested + unit tests
Flag: com.android.server.accessibility.enable_color_correction_saturation
Change-Id: I1162a501a797a1d2b30da76f0c75e5fdea3f61d2
2024-07-22 21:09:54 +00:00
Treehugger Robot
0dcf3ff102
Merge "[Dev options] Conditionally show Freeform toggle: Only display when freeform is NOT available by default on the device." into main
2024-07-22 20:34:19 +00:00
Joshua Mccloskey
9d47208270
Merge "Fix settings crash for non-fingerpirnt devices" into main
2024-07-22 19:57:02 +00:00
Joshua McCloskey
cfb087632c
Fix settings crash for non-fingerpirnt devices
...
Test: Verified that Settings does not crash on non-fingerprint devices
Flag: EXEMPT bugfix
Fixes: b/350635316
Change-Id: Ia6be6672cf8f8d84b2503fdb305a0217224a864d
2024-07-22 18:32:33 +00:00
Alina Zaidi
9609216cb5
[Dev options] Conditionally show Freeform toggle: Only display when freeform is NOT available by default on the device.
...
Previously Freeform Toggle was a no-op when freeform was by default available on devices
On the other hand Desktop mode toggle is displayed only when freeform IS available by default on the device. (This is because desktop mode support is tied to devices with default freeform capability.)
Also update toggle strings for a clearer user experience
Test: Updated tests
Bug: 348193756
Bug: 348186127
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: I29e36a939db78010bb3153e756f95bb6c21a31f9
2024-07-22 18:11:14 +00:00
Ram Peri
f5b58ea3be
Robolectric upgrade
...
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
2024-07-22 13:48:09 -04:00
Joshua Mccloskey
51bb0fe4e4
Merge "Added new fingerprint metric categories." into main
2024-07-22 17:35:20 +00:00
Joshua Mccloskey
bc726eda18
Merge "Refresh templates when fp removal fails" into main
2024-07-22 17:33:15 +00:00
Joshua McCloskey
f624d6adf7
Refresh templates when fp removal fails
...
Test: atest
Fixes: 339556796
Flag: EXEMPT bugfix
Change-Id: I369e37f170a57bc9ced98f9728d06f2072c01263
2024-07-22 17:33:03 +00:00
Joshua Mccloskey
ac8ba2ae08
Merge "Show disabled summary for CDC" into main
2024-07-22 17:27:02 +00:00
Matías Hernández
6e9555e604
Merge changes Iceadf4a1,If2b6b06b into main
...
* changes:
Final (?) touches to people/apps/sound circles
Show icons for allowed contacts
2024-07-22 17:27:01 +00:00
Matías Hernández
44c7272733
Final (?) touches to people/apps/sound circles
...
* Support comparing icon sets with a custom equivalence (needed because AppEntry doesn't implement equals(), and somewhat tricky because CircularIconPreference itself is not generic).
* Use final icons for allowed sounds.
* Use final appearance for +n icon.
Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: Iceadf4a182e607111afb72ff36bca872a62ae040
2024-07-22 17:06:38 +02:00
Treehugger Robot
3177febb4f
Merge "Add null check before PackageManager operations" into main
2024-07-22 14:46:47 +00:00
Dipankar Bhardwaj
64e01615cb
Add null check before PackageManager operations
...
Change-Id: I401fa2585975848e4b7301ccbadd8386b8ca17b9
Test: n/a
Bug: 353206855
Flag: EXEMPT minor NPE fix
2024-07-22 13:41:59 +00:00
Haijie Hong
11865236b0
Update color of ring battery indicator
...
Test: verify the color locally
Bug: 343317785
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I96b7775dfca51c4304b413a9a56a6489d735f748
2024-07-22 20:26:59 +08:00
Matías Hernández
d8b9fe8f01
Show icons for allowed contacts
...
Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: If2b6b06b4a9c16bdefb03850ad1615e96c601fbd
2024-07-22 14:20:25 +02:00