Bill Yi
591424e2a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icedfb20c3e27ecae17dcbbd0e5ab42382181ed6f
2024-07-24 10:00:13 -07:00
Pat Manning
2649a7bf56
Merge "Log metrics for pointer icon settings changes." into main
2024-07-24 15:05:57 +00:00
Treehugger Robot
28323b908f
Merge "Clear cache data to recalculate usage slot after receiving timezone change intent." into main
2024-07-24 13:22:30 +00:00
Matías Hernández
5eb776adef
Merge "Show confirmation dialogs when enabling or disabling a mode" into main
2024-07-24 12:33:56 +00:00
Joseph Vincent
9ce298db71
Merge "Remove todo from PrivateSpaceMaitainer code" into main
2024-07-24 11:59:26 +00:00
Treehugger Robot
0039f8ec2b
Merge "Make vendor can override the condition of adjusting properties of header text" into main
2024-07-24 11:40:19 +00:00
Matías Hernández
77191e9519
Show confirmation dialogs when enabling or disabling a mode
...
(Strings are not final, but structure is there).
Bug: 349376785
Test: atest ZenModeSetTriggerLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Ia9e604483b90bc30ad1c12e5663a07e251084073
2024-07-24 13:14:41 +02:00
Yuanru Qian
e8f15fd1f5
Merge "Remove ex-team members from OWNERS" into main am: 8303a38d10
am: 97f922d60c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191891
Change-Id: I6cb2cd56da335ee064fc4c4ee89c1e56f797cfca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 10:43:15 +00:00
Wu Ahan
560a0fa9e8
Make vendor can override the condition of adjusting properties of header text
...
Move the condition inside FingerprintEnrollEnrolling#maybeHideSfpsText
can be overriden by vendor implementation.
Flag: EXEMPT bugfix
Bug: 344839309
Test: Manually
Change-Id: Ie497ac973575825667f6bb4d871149488dcdaed7
2024-07-24 10:28:23 +00:00
Yuanru Qian
97f922d60c
Merge "Remove ex-team members from OWNERS" into main am: 8303a38d10
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191891
Change-Id: I39c450800b0a3fc08d7cab8e74ff7318f753cbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 10:27:41 +00:00
Yuanru Qian
8303a38d10
Merge "Remove ex-team members from OWNERS" into main
2024-07-24 10:06:07 +00:00
mxyyiyi
9933688333
Clear cache data to recalculate usage slot after receiving timezone change intent.
...
- Clear usage slot & even hour calculate event.
Bug: 355084572
Test: atest BootBroadcastReceiverTest
Test: atest BatteryEventDaoTest
Flag: EXEMPT bug fix
Change-Id: I0bc8b71219ce8cea3987a7bfc39b69e0c6047e3d
2024-07-24 18:02:00 +08:00
Yuanru Qian
3fac9ad21b
Remove ex-team members from OWNERS
...
Change-Id: I025d4963e5b63a28fb0fe36df8a4e1fdd76a9b3d
2024-07-24 09:41:31 +00:00
Haijie Hong
24bf20f033
Don't add profiles to device details page if it's null
...
Change-Id: Ia79fa600c87905a6a2cbf8459910d67ffb9d22dd
BUG: 341293298
Test: manually test in tablet
Flag: EXEMPT minor bug fix
2024-07-24 09:11:46 +00:00
Treehugger Robot
83f934b5b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-24 05:15:15 +00:00
Treehugger Robot
4da8383ef9
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-24 05:15:15 +00:00
Yuchen Sun
ed3594fe61
Merge "Clean up preference_summary_default_combination in Settings." into main
2024-07-24 04:29:03 +00:00
Yuchen
48f304a23f
Clean up preference_summary_default_combination in Settings.
...
Test: Existing tests passed
Flag: EXEMPT clean up
Bug: 328519240
Change-Id: I86996c43243b7a8e2d4b1a83180c189986b3a6ca
2024-07-24 02:36:09 +00:00
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
aafc863290
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1491ee3b096e4a9994b541ea5e465c76ab837a85
2024-07-22 21:20:11 -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
98e196d589
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia536ad687db4074b9e8246c8701ce58c46c0a989
2024-07-22 21:17:35 -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