Commit Graph

109364 Commits

Author SHA1 Message Date
Bill Lin
3db69adf01 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev 2022-05-18 01:43:56 +00:00
Sally
301d621608 Set a pane title on the some a11y windows' root views
This allows a service to identify a window based on the title.
Configuration changes will restart the activity, losing a11y focus.
A11y focus may be retained by matching windows and unique ids. This
CL allows matching by window/pane title.

Test: manual
Bug: 175182916
Bug: 175184180
Change-Id: Iae4627795c2a35e57b651d9e7ce7527a0ddb1353
2022-05-17 17:36:21 -07:00
Bill Yi
6890a9fd64 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic0f549f0b25dd8efcc2dacc5fac86f53bccbc68a
2022-05-17 16:37:48 -07:00
Bonian Chen
fa6c9f3a53 [Settings] Stop network mode query when changing config
Changing the configuration of network mode could take a long time.
In some cases, it blocks the query operation.
This is a change to stop query operation from execution during the time
when configuration is changing.

Bug: 227431634
Test: local
Change-Id: Ifeb16e7e9a0ec3de970fe588a1cce6d31fbba9cd
2022-05-17 15:25:12 +00:00
Roozbeh Pournader
ad389346c8 Reland "Don't use framework strings for formatting file sizes"
Reland http://ag/2529020 because the over-translation issue should be
resolved now.

Modify various formatters to avoid using framework strings for
formatting file sizes.

Also update README instructions for running unit tests.

Bug: 36994779
Bug: 71580745
Bug: 217592956
Test: no new test failures from RunSettingsRoboTests
Test: manual opening the settings page.
Change-Id: Ic4689ab1b76622028004d05e69858228bdc441cf
2022-05-17 16:06:55 +01:00
Kate Montgomery
dc67fb3283 Flag off stickiness of show/hide system setting.
Bug: 191503437
Test: atest SettingsRoboTests
Change-Id: I96e287cb870265e6ce379e64d01f134f8b3dde59
2022-05-17 14:24:41 +00:00
Bonian Chen
61a85eaee7 [Settings] Select RAT in between SIMs for Internet
The internet page RAT need to be selected based on default data SIM.

Bug: 230190055
Test: local
Change-Id: I87edd7a9ddadf877b9cc0c678e3bba423666125e
2022-05-17 18:40:06 +08:00
Arc Wang
3cb8171f4f Center apps Preference title when there is no summary
Hide apps Preference summary when a summary is empty
then its title will be vertically centered.

Bug: 229646669
Test: manual visual
      Settings -> Apps -> See all apps
      Settings -> Notifications -> App settings
      Settings -> Storage -> Apps
      Settings -> System -> Language & input -> App Languages
Change-Id: I6fceba243e2ccac9ea180b940b571da07e1ba805
Merged-In: I6fceba243e2ccac9ea180b940b571da07e1ba805
2022-05-17 09:09:08 +00:00
Arc Wang
e4673a3dc8 Center apps Preference title when there is no summary
Hide apps Preference summary when a summary is empty
then its title will be vertically centered.

Bug: 229646669
Test: manual visual
      Settings -> Apps -> See all apps
      Settings -> Notifications -> App settings
      Settings -> Storage -> Apps
      Settings -> System -> Language & input -> App Languages
Change-Id: I6fceba243e2ccac9ea180b940b571da07e1ba805
2022-05-17 07:35:47 +00:00
Bill Yi
0aaa6d1154 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia9ec4145b47950134a508ff097af5ecf68d5b19d
2022-05-16 22:10:20 -07:00
Bill Yi
66baefeaed Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4dedb1e337f5660fa80c37385bef2e8ae1b08586
2022-05-16 22:06:36 -07:00
Bill Yi
ac5ba6b7cb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7c8978cfb133579ecf2bb4537228e63026e62868
2022-05-16 22:02:32 -07:00
Bill Yi
ff3c01f123 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I223b563990583b86dd7fbab599b6f2d62a3df68e
2022-05-16 21:46:50 -07:00
Chaohui Wang
f9ebeadb33 Fix flicker in Location page when location is off
Caused by the recent location access preferences not have there initial
visible stats set before creating the view.

Refresh the location stats in displayPreference() for them to fix.

Fix: 232342339
Test: manual visual
Change-Id: I4023fd3a5860490e9c6cb733933a19f96824a53d
2022-05-17 10:36:50 +08:00
TreeHugger Robot
bbab32409c Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: f5b2d6bf85 am: 4271a34c16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Iacbe1558fb09a2c19f71268b8ce1704506a27988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:57:05 +00:00
Arc Wang
ae9e35a8e5 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 0e2485a762 am: 1a55855a39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Id2cb8a397c471d070dc8351dfe8b75d808b6c10f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:56:30 +00:00
TreeHugger Robot
1d382e7729 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 6e7e95593a -s ours am: 4e520cbeb3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397885

Change-Id: I98bab765ab2ebac10e8ac51892793f4d215a9578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:39:11 +00:00
Bill Yi
94531cf016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: d2388e01b3 -s ours am: 21365f1d25 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397885

Change-Id: I86b05f60e6ca792549a6f3d1908780e8f7dc7b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:39:03 +00:00
TreeHugger Robot
8db65cde5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: 14e9b89377 -s ours am: 8c15a74d62 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882

Change-Id: I54c61321396966a5478b347680031f2395f31d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:38:46 +00:00
Bill Yi
1bbea2a2d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: 74a4376590 -s ours am: 5de62a3ab7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882

Change-Id: I5f0bdde18142d0fca52a2f21d06024b2b7c63655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:38:27 +00:00
TreeHugger Robot
fa13540d9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6bc7ea75a7 -s ours am: 85f04741e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397884

Change-Id: I5f77391cc47dea582875c0e4090ce130b795f38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:35:51 +00:00
Bill Yi
1f47db1dce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93bd223fdf -s ours am: 42caff50f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397884

Change-Id: Ibbfc1099bb4e5182adc79a79d267a254bf6d5bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:35:44 +00:00
TreeHugger Robot
77571a7688 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7b538df037 -s ours am: d67de35b9d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396761

Change-Id: Ib45fdf4cf478c94e4c543f38f9a2fb61be1aca12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:35:24 +00:00
Bill Yi
22bd4ab194 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c81a73dd -s ours am: 73958e15fc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396761

Change-Id: I8162f181f4e6fff7c153c4036e3a9ffedd443548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:35:07 +00:00
TreeHugger Robot
4271a34c16 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: f5b2d6bf85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I2cff8564aad6e898040338d529c59eaca6e9c85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:29:18 +00:00
Arc Wang
1a55855a39 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 0e2485a762
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I01fecf6b807cae539b2304e331f05a497470c432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:29:00 +00:00
TreeHugger Robot
4e520cbeb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 6e7e95593a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397885

Change-Id: I546264cb3d6591dc2fe63bf5b12e58ebdd3645b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:12:38 +00:00
Bill Yi
21365f1d25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: d2388e01b3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397885

Change-Id: I8db0c97a6f75842ebacd38fe8731fb4acfa59cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:12:22 +00:00
TreeHugger Robot
8c15a74d62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: 14e9b89377 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882

Change-Id: I7f263aa47b781e5ebd929750217cb41e94c36f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:12:04 +00:00
Bill Yi
5de62a3ab7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: 74a4376590 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882

Change-Id: Ia4262843457d4fb99e2021a548c1ae0f5782023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:11:47 +00:00
TreeHugger Robot
85f04741e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6bc7ea75a7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397884

Change-Id: Iae60069b5214f1588b528335e45e12b6611e114e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:08:03 +00:00
Bill Yi
42caff50f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93bd223fdf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397884

Change-Id: Ic736fb436b499dbb11af6e6240ad41b15cc1318c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:07:41 +00:00
TreeHugger Robot
d67de35b9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7b538df037 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396761

Change-Id: I50b4cba5ea7daeb084910ea69d0f0e6492065b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:07:20 +00:00
Bill Yi
73958e15fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c81a73dd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396761

Change-Id: If90b0f6a940f8e8445a232b56454d02647483331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:07:07 +00:00
Hugh Chen
c4899bf019 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I843f83e71e4f637f3cd6d851174d8f46745c2eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:05:35 +00:00
Hugh Chen
40ed71c895 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I9aea03a94b613a948fb141d709a3f59aafc1b047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 21:32:31 +00:00
Hugh Chen
136af4e593 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I6b82d1d82654386eeb76efc977d4dc6abfd7e627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 21:06:42 +00:00
Hugh Chen
8ce854af29 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: Ia756b506704aa52e74946365db61e75d807ec38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:44:25 +00:00
Hugh Chen
0e568376a3 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: If4c6c7b6e4a52ff3c4e53915a6af9d5196ddcaaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:44:16 +00:00
Hugh Chen
e5d54e867c [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: Iab803b2095895dd2c74ddf85d4825f99461379fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:44:08 +00:00
Hugh Chen
ddc8e16cd6 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: I2974cc1f7229b3fb1dc1a102622fd51f99cce71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:18:09 +00:00
Hugh Chen
3d0db8d34f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: Ib3757ce8331bca132fac28ef4c07ee67c1949379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:18:03 +00:00
Hugh Chen
22ce749aa6 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: I7c6a9f85f48ac5a5ccf4eeeb05d90e55c1744ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:16:32 +00:00
Hugh Chen
f13ceb8aea [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692

Change-Id: I2bf3cc43e484dd321a2fbc88e8cce5c4e3f74099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:27 +00:00
Hugh Chen
dc1023e587 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691

Change-Id: I5647f69523610c0596b7d58087609b3a50ca59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:22 +00:00
Hugh Chen
8ddd1d70b2 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693

Change-Id: Idb833457913af76144b1130b7c83558680ba8b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:05 +00:00
Tom Hsu
45c60f8564 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev 2022-05-16 18:38:36 +00:00
TreeHugger Robot
ce98ad58a5 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I54b9e0292e97a8789653dc1dd8a6bb4e5e444d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:31:32 +00:00
Hugh Chen
97299b8c00 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689

Change-Id: I525120b808c5742122b74c82e971dc315211058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:31:30 +00:00
Hugh Chen
eab5e61360 [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 23ab123ba7 -s ours am: a2d6c9a087 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Change-Id: If614dae2b5a69b82c149cbd87bb7e3b31002457a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:31:22 +00:00