Salud Lemus
9a91b3970b
Merge "Remove default admin support message for an Enterprise device" into sc-dev am: b687a9757c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13810347
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I241fcb7ac0be3de7d7bfd177a9c8d6c1e277792f
2021-03-10 15:44:19 +00:00
TreeHugger Robot
4316e21bc0
Merge "Implement temporary asset in settings page" into sc-dev am: 48f6ec410e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0aa7809c33264289cce74b4dabc46a9f567136b4
2021-03-10 15:42:59 +00:00
Abel Tesfaye
8fda5e167b
Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev am: e604c56241
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13777300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b7926a58d6c0f2aefe60f5a74dbeb6c72493eba
2021-03-10 15:18:45 +00:00
Ahaan Ugale
5f60cdeb3a
Merge "Use androidx LifecycleObserver for wiring up controller lifecycles." into sc-dev am: c21337d44f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13804075
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib73f27f861da5f6b18484ab430df2b38297bcc44
2021-03-10 14:59:43 +00:00
Ahaan Ugale
3fe039ae35
Merge "Add javadoc about lifecycles for xml defined Controllers." into sc-dev am: b4b0207e09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13804074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a3efa10ba147bdf37f1a2ee41c74662ef322241
2021-03-10 14:59:41 +00:00
Victoria Lestari
8ffad14abe
Merge "Revert "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default""" into sc-dev am: f760ea0639
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13785874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e4d9578ecd26d2d6e741503835bf9030c918726
2021-03-10 14:45:04 +00:00
Zoey Chen
e6532c41d1
[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f am: 9988792138 -s ours am: 0872d40a75 -s ours
...
am skip reason: Change-Id I52af54045872bbf13e64d5d94c8b027ec702abb9 with SHA-1 ea29704e40 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3db8596631fe30f0b4956613526acc9f728ebe8
2021-03-10 14:06:01 +00:00
TreeHugger Robot
8de08d26da
Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev am: be1b2f307d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2938fc59e94aee8b1530d0d582eab9efac1e761
2021-03-10 14:04:52 +00:00
TreeHugger Robot
aef33faecd
Merge "Prevent app bar title from drawing twice" into sc-dev am: 50129cc4db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812555
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I039672dcf9ba137de488662cdaf963cc195ee2e1
2021-03-10 14:04:47 +00:00
TreeHugger Robot
4895c08f6e
Merge "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev am: 3dacd0209c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812549
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46a82f001837aeadc4482dc3c5165581d5067dbc
2021-03-10 14:04:39 +00:00
TreeHugger Robot
9ffa922a81
Merge "Update fingerprint layouts for landscape" into sc-dev am: 6ef1bc7336
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806600
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa7dd88aa23ac96e00472430c78180f9bdb2802b
2021-03-10 13:47:40 +00:00
Edgar Wang
764f86e6e3
Merge "Refactor MainSwitchBar" into sc-dev am: 3f051ac871
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566507
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95440e5224d9f089ef712d6c9bbf672e63e18867
2021-03-10 13:31:13 +00:00
TreeHugger Robot
00fd3140d9
Merge "Move injected services for work into a new page" into sc-dev am: 3b477b13e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13791190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I13c3f62a376d1a6296a1f4edb92d08e1245169e5
2021-03-10 13:31:04 +00:00
TreeHugger Robot
ac81149283
Merge "Add "See All" page for Recent Location Access" into sc-dev am: f605777f10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775472
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5cd287f55a066d4f659c75b52bbf178874bcc6e
2021-03-10 13:30:54 +00:00
Paul Hu
ff9a14ee9b
Merge "Update Utils#getTetheringLabel usage on Settings" into sc-dev am: e5e60115db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13794937
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I738284f26afea3c2773d95efafadfe6d9b1180a9
2021-03-10 13:14:16 +00:00
TreeHugger Robot
72e2196eac
Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev am: 6535fe00c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54f0952dfd9ba31e9f734cfca9ef043532d14d89
2021-03-10 13:14:08 +00:00
Kevin Chyn
6146f860dc
Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev am: 5dca77291b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13792643
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iab03e2d8af40c7ae9adb8d8c4dd862a144b3efa6
2021-03-10 13:13:10 +00:00
Alex Salo
7e839d0ad3
Merge "Fix long press auto rotate implementation bug" into sc-dev am: 8bfbd34662
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775970
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23f61e90877fed4545ee62742c984ac084880a5f
2021-03-10 13:11:33 +00:00
Michael Wachenschwanz
860b6272f9
Merge "Update FakeUid with energy to charge change" into sc-dev am: 8625648a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13598823
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a086d7022d0be64281281bf934310fcba339933
2021-03-10 13:11:18 +00:00
Salud Lemus
70d465b284
Merge "Update Action Not Allowed Dialog text for a financed device" into sc-dev am: 50527b1f63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13733826
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80c350ff2dd1bdc453154d04fb73c493a63e04f0
2021-03-10 13:11:10 +00:00
TreeHugger Robot
67ddcc6834
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5f2befdb4f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13807103
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91e7de1c080ce78ead7363871a49a84ed6b52559
2021-03-10 13:10:50 +00:00
TreeHugger Robot
2530a0489c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 082d84d63d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13807097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ed831bd1b46de1752d3d5d42e3e2443c6947fd9
2021-03-10 13:10:46 +00:00
Victoria Lestari
a1c41232bd
Merge "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"" into sc-dev am: fc037c26dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13785873
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I119162406d4e76334fe70db8a36ea9d6a4fd9fb7
2021-03-10 13:10:42 +00:00
Victoria Lestari
d6ac0d9d96
Merge "VoiceInputHelper should not show recognition service if it's not selectable as default" into sc-dev am: 026854ea4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740889
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87b92db000ba5bd2e764213ac00566b2178dc598
2021-03-10 13:10:36 +00:00
TreeHugger Robot
9c89af1390
[automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b am: ebb056faff -s ours am: d53c640946 -s ours
...
am skip reason: Change-Id I657de039d667f5aee0941336e9361ae04f056c33 with SHA-1 159bd0e966 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9582875fe7e695107377452a670480502f7ed59
2021-03-10 13:05:06 +00:00
Menghan Li
cd7c76dcf4
Merge "Update accessibility settings layout" into sc-dev am: d4657b4c6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7798594783384b486508327ff100f5ffa96fd3e1
2021-03-10 12:16:15 +00:00
TreeHugger Robot
8080696f28
Merge "Update FingerprintEnrollFindSensor for landscape" into sc-dev am: 0b29ebd420
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cb62c3128b5397aaa43beec52c6944fb0ad3707
2021-03-10 12:16:08 +00:00
TreeHugger Robot
8270e72a45
Merge "Change ScrollView to NestedScrollView for language list" into sc-dev am: a87ab24b07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774519
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c2c601efcd95308b3bf1ea491b8524646dc8429
2021-03-10 12:16:00 +00:00
TreeHugger Robot
39b23a3aa8
Merge "Fix NPE crash during setup flow" into sc-dev am: fc6e9c8e40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13779503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iab1d3998930d3ab424f339e967cf0886e7fdf548
2021-03-10 12:15:56 +00:00
Ahaan Ugale
35f0c68a09
Merge "OWNERS for autofill and assist settings." am: 7af352dc73 am: 6d5dc7b451 am: 3879729cd1 am: fbddfeba11
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9188f577bd108baf0c17255c376f4156188c1e01
2021-03-10 12:15:51 +00:00
Trevor Black
482f772329
Merge "Add Extra App Info into Settings App UI." into sc-dev am: c6a359a2a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13587962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id237f0f3c631f4a0bcf1ddc21180decfe0f7a782
2021-03-10 12:15:38 +00:00
TreeHugger Robot
8c6564b67e
Merge "Prevent a larger title from displaying incompletely" into sc-dev
2021-03-10 12:10:10 +00:00
Mill Chen
a01f882e61
Use title area for enrollment error messages
...
This CL is trying to put the enrollment error messages into the title
area for UDFPS, and left the red text for the older devices with a rear
fingerprint.
Fixes: 178432748
Test: visual verified
Change-Id: Ib3a81531219dc963723ad0de99f079a230c580f5
2021-03-10 19:46:13 +08:00
TreeHugger Robot
d1366fce52
Merge "Add a missing string for new Intent Picker" into sc-dev am: f2bbadf57b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13794934
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaad33d08e5e4bc14134c969c11e71ad8ebab06e1
2021-03-10 11:08:04 +00:00
Weng Su
38db749677
Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev am: 5c82ddf075
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie83fff6eae71542d0d10dd554653572d59b95bd9
2021-03-10 11:07:57 +00:00
Yomna Nasser
a41ceaf67a
Merge "Add metrics to Enable2gPreferenceController." into sc-dev am: b6042cec85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13743650
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I45e7b17fb8fa0e31d527f399ef3c7df941db099b
2021-03-10 11:07:43 +00:00
Weng Su
a8b49a8d69
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours am: 354bdce86b -s ours am: 41c1e71b0b -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 32d5d3a3a3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b8a124458d3f1017af7fdaa54876fdfca3dc3b2
2021-03-10 11:06:38 +00:00
Weng Su
7220095e95
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 422280c10d -s ours am: 01961e9e11 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I368f444875b6ff7c54cd78ca38b7869a9076659c
2021-03-10 11:06:32 +00:00
Ahaan Ugale
b622520209
Merge "AF: Show passwords settings for available autofill service." into sc-dev am: 1d1f3ea85f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13723064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c1ddc3fd8ae02cbf6ef2cc16fb6ba3123b23cd8
2021-03-10 11:05:56 +00:00
Yanting Yang
16b6910b7d
Merge "Update metrics category for new app page" into sc-dev
2021-03-10 08:43:13 +00:00
Ahaan Ugale
1515b2bb78
AF: Unit tests for PasswordsPreferenceController.
...
Bug: 169455298
Test: atest SettingsUnitTests:com.android.settings.applications.autofill.PasswordsPreferenceControllerTest
Change-Id: I5cbbb17f192b963a634690a95a591d3f51f47436
2021-03-09 20:08:06 -08:00
Mill Chen
a5c91ef0fe
Prevent a larger title from displaying incompletely
...
Some larger titles in the accessibility will be wrapped into 2 lines and
the tille looks like incomplete. This is because after starting to
scroll down, the collasping toolbar detected the length of title is
longer than the width of container and wrapped the title into 2 lines.
To prevent this, we intented to reduce the end margin for the collapsing
toolbar.
Fixes: 182235627
Test: visual verified
1) Adjust font size to largest
2) Navigate to Settings -> Accessibility -> Text and display -> Color
correction
3) Observe and see if the title is wrapped into 2 lines
Change-Id: I1595b9ab4f8406bf6505f56786438c9030b5be59
2021-03-10 10:51:38 +08:00
Kevin Chyn
39b2fe8bd5
Update fingerprint revokeChallenge with frameworks/base
...
Bug: 181977689
Test: manual
Change-Id: I92e6dae58d67f1355c6d0ba3bbf95ff2ad5247ed
2021-03-09 18:12:54 -08:00
TreeHugger Robot
38e19abdf7
Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev
2021-03-10 01:44:42 +00:00
Kevin Chyn
e91e39b604
Update revokeChallenge together with frameworks/base
...
Bug: 181977689
Test: Inspect logs
Change-Id: I588ec46896d57d89489f78505a6f2c932462b2d2
2021-03-09 16:25:28 -08:00
Salud Lemus
b687a9757c
Merge "Remove default admin support message for an Enterprise device" into sc-dev
2021-03-10 00:21:37 +00:00
TreeHugger Robot
48f6ec410e
Merge "Implement temporary asset in settings page" into sc-dev
2021-03-09 23:50:44 +00:00
Abel Tesfaye
da3a845c4f
Update autorotate search terms
...
Test: local
Bug: 182226081
Change-Id: I6665046a34aad19c245585bfd3d997d631c52bea
2021-03-09 21:12:36 +00:00
Abel Tesfaye
e604c56241
Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev
2021-03-09 17:39:50 +00:00
Ahaan Ugale
c21337d44f
Merge "Use androidx LifecycleObserver for wiring up controller lifecycles." into sc-dev
2021-03-09 17:11:53 +00:00