Commit Graph

123123 Commits

Author SHA1 Message Date
Oli Thompson
dcce8fa662 Fix emergency button not visible on pattern work challenge screen
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing

Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
2023-06-09 13:06:39 +00:00
Mady Mellor
fb1e921bd9 Update the colors for bubbles settings based on new spec
Test: manual - get a bubble, go to that apps bubble settings screen,
               observe the colors look correct, switch theme and
               check again.
Bug: 283951560
Change-Id: I28fa64f8d7b53419a57615bf3da4da7eff049674
2023-06-08 13:23:54 -07:00
Mady Mellor
ee31358597 Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: Id35a456c7a07f1c232150aa9223f5a84d33dcf06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 18:22:59 +00:00
Mady Mellor
8a47899369 Merge "Fix colors in bubble settings so they're more visible" into udc-dev 2023-06-08 17:35:55 +00:00
Mady Mellor
f184678802 Fix colors in bubble settings so they're more visible
Test: manual - get a bubble, go to that apps bubble settings screen,
               observe the colors look correct, switch theme and
               check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
2023-06-08 09:21:13 -07:00
jasonwshsu
ac04ce9091 Change the summary string to exclude 'Audio output' feature
'Audio output' plan to punt into U-QPR or V. Change the summary to not mention it.

Bug: 286174797
Test: flash rom and check UI not exist
Change-Id: I66ffb26c9b9ed612f41be7025a474cc63f256d87
2023-06-08 09:05:53 +00:00
Treehugger Robot
c334825405 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I4d882fe72b24e512d089772378cdc31d69e277e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:26 +00:00
Treehugger Robot
a34a510a40 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev 2023-06-08 00:15:18 +00:00
Oli Thompson
ab73c1a3e3 Fix low contrast on work challenge screen emergency call button
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
2023-06-07 19:25:59 +00:00
Aleksandar Kiridžić
85bc7cf3e8 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I7067a39e91e74c5956e2301081f53f021bfdb979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:42:39 +00:00
Aleksandar Kiridžić
b5b15a6689 Merge "speech: On-device recognition settings profile selector" into udc-dev 2023-06-07 17:53:38 +00:00
Fabián Kozynski
5ec8f8d315 Fix typo in product string
Fix the typo so the string displays in the correct products.

Test: manual, using tablet product
Fixes: 284007230
Change-Id: I970c214f46e0d30ecb92ff8f24c6f3fd8dfe33e3
2023-06-07 12:45:41 -04:00
TreeHugger Robot
19f1707fda Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ia5b21af9f18c286c5f8cdb480209db5859e53e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:03:24 +00:00
TreeHugger Robot
3e374cc7a7 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev 2023-06-07 12:13:51 +00:00
tom hsu
bf7865b27e [Settings] Fix crash when user enter bluetooth page quickly.
- When SliceManager try to pinSlice, process may not have the permssion
   yet, so in Androix lib it use try/catch to avoid Security exception.
   However, if SliceManger quickly unpinSlice after pinSlice, process
   may still not get the permission yet, then due to no security
   exception, it cause the settings crash.

Bug: 283065718
Test: atest passed
Test: Manual test passed
Change-Id: I2293fca73e65dfaa34237abe57e0c6a3fe0f62bb
2023-06-07 09:37:21 +00:00
George Chang
4b49493d05 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I65f5b640f3f66f69f83cab8f81f6229064f6d363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:33:13 +00:00
George Chang
832e0b015e Merge "Correct typo in the launch via NFC bottom string" into udc-dev 2023-06-07 09:02:51 +00:00
Ale Nijamkin
306421f87f Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Iedb6d5b7454e973a99d512cda94b0278fa801d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 19:44:07 +00:00
Ale Nijamkin
b5dda005fd Merge "Fixes nav stack issue." into udc-dev 2023-06-06 18:48:59 +00:00
Matías Hernández
ff255c6eda Don't hide approved NLSes in Settings
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.

Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
2023-06-06 19:07:58 +02:00
Treehugger Robot
8b66ae6b87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b9eed2e78368c0b370f831fe69d263921d2614a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:51:19 +00:00
Bill Yi
a8d77892c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a59db556b021ca9d97782164217add35ebb9e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:51:18 +00:00
Treehugger Robot
870f0419f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4610de244a9baa232d58a30181f3be3c42fea106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:50:05 +00:00
Bill Yi
49f5f56f49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69bdf0bc5cb35f780fa1035d27ff902f862cae4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:58 +00:00
Treehugger Robot
ffb82ce1db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e49762cb2ebea487b63ccc6c2732895c8274340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:53 +00:00
Bill Yi
e1941faedf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa73d6b302eed520e634a98d33d36fb3ae4d2b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:37 +00:00
Treehugger Robot
3a4ccd256d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba859518647b49423316d298c38b51216dbc568e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:25 +00:00
Bill Yi
2b6188c8c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife9613f867cab307379fd3d12848718f1e1343b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:12 +00:00
Treehugger Robot
059773bd86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03d8e31c1ab27742b95e0a528a135aa15db4e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:46:16 +00:00
Bill Yi
284d320abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e9438ad10906e729a3eafbb69410fa4ce011c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:46:11 +00:00
Treehugger Robot
ba4dc8f0bc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
d8d85a8485 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
f996cfceba Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-06-06 14:19:16 +00:00
George
d41299016e Correct typo in the launch via NFC bottom string
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
2023-06-06 21:39:01 +08:00
Aleksandar Kiridzic
a882fd268d speech: On-device recognition settings profile selector
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.

Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
2023-06-06 14:10:34 +01:00
Treehugger Robot
e6d4fa7daa Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: I94b718ca2dfebe1a704e558efb9e4dcf1c9cb200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 06:38:26 +00:00
Treehugger Robot
185244f43d Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev 2023-06-06 05:49:40 +00:00
Alejandro Nijamkin
6f9f3a4594 Fixes nav stack issue.
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.

Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.

Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
TreeHugger Robot
af27dd5a9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7fdceab7eb4cb84db6b34477cd2125e8b3cbf7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:58:52 +00:00
Bill Yi
1f4d5cbba3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84d4d5393cdef7a87e4e3f73805ccfe6800895e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:58:49 +00:00
Bill Yi
8d90146056 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5fac238b3d37f5da6fbbf6c0dd5468af3114a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:37:11 +00:00
Bill Yi
5594e824f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2c186f557f166d12ff47738012089698b80249e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:36:54 +00:00
TreeHugger Robot
8f5a0bc281 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie20278858c925933506dbd5bc6d71e486d45e89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:19:27 +00:00
Bill Yi
a18807d9ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c3201ad1377bc074940b211483a7c0f76630d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:19:23 +00:00
Bill Yi
aeacaaee64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie42f1d09d6218ba3350b6971370fd554ea10f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:18:41 +00:00
Bill Yi
0a31322199 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf4243052f0b3cf46d02ca11aa64f9e48e8c9a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:11:33 +00:00
TreeHugger Robot
a28a3df494 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-05 19:38:55 +00:00
TreeHugger Robot
719a4c645f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-06-05 19:35:48 +00:00
Treehugger Robot
276d663000 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-05 19:34:58 +00:00