Commit Graph

80006 Commits

Author SHA1 Message Date
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
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
Edgar Wang
3f051ac871 Merge "Refactor MainSwitchBar" into sc-dev 2021-03-09 06:34:44 +00:00
TreeHugger Robot
3b477b13e1 Merge "Move injected services for work into a new page" into sc-dev 2021-03-09 04:25:18 +00:00
TreeHugger Robot
f605777f10 Merge "Add "See All" page for Recent Location Access" into sc-dev 2021-03-09 03:36:56 +00:00
Paul Hu
e5e60115db Merge "Update Utils#getTetheringLabel usage on Settings" into sc-dev 2021-03-09 03:33:01 +00:00
TreeHugger Robot
6535fe00c7 Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev 2021-03-09 03:07:42 +00:00
Edgar Wang
7eeca8bc65 Refactor MainSwitchBar
- Extract RestrictedLockUtils related things to SettingsMainSwitchBar

Bug: 180226735
Test: robotest
Change-Id: I694cdb181c137bd2f22cc1d4e466f7e203f8c0e2
2021-03-09 03:02:05 +00:00
Kevin Chyn
5dca77291b Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev 2021-03-09 02:26:15 +00:00
Alex Salo
8bfbd34662 Merge "Fix long press auto rotate implementation bug" into sc-dev 2021-03-09 00:15:43 +00:00
Michael Wachenschwanz
8625648a88 Merge "Update FakeUid with energy to charge change" into sc-dev 2021-03-08 23:46:08 +00:00
Yu-Han Yang
b04a984813 Move injected services for work into a new page
Screenshots: http://shortn/_0BiBfpkHfh

Bug: 180533061
Test: on device
Change-Id: Ie488c80856b4c4cc67789b8239005f6001ed9d87
2021-03-08 13:31:34 -08:00
Yu-Han Yang
cdb3551be1 Add "See All" page for Recent Location Access
Screenshots: http://shortn/_UPy8KFSeSj

Bug: 180533061
Test: manual on device
Change-Id: Ib77bc0705835520ed1a2d3b7f662088ed838e53e
2021-03-08 13:27:45 -08:00
Salud Lemus
50527b1f63 Merge "Update Action Not Allowed Dialog text for a financed device" into sc-dev 2021-03-08 21:08:52 +00:00
TreeHugger Robot
5f2befdb4f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-08 20:59:06 +00:00
TreeHugger Robot
082d84d63d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-08 20:53:45 +00:00
Salud Lemus
b45d87715a Update Action Not Allowed Dialog text for a financed device
Bug: 173826319
Bug: 158157476
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: Iefeb0b653764952e409dfd862d9cc54c4f5e7fc9
2021-03-08 19:06:13 +00:00
Victoria Lestari
fc037c26dd Merge "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"" into sc-dev 2021-03-08 17:39:23 +00:00
Victoria Lestari
9516314de4 Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"
This reverts commit 765edb60a3.

Reason for revert: b/182170686

Change-Id: I4e1551bed44b22b12541e92a4d940ec131a1ff34
2021-03-08 17:36:18 +00:00
Bill Yi
cf61ece583 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iba4f7437d67dc99f0736c3592b7a84be9043f017
2021-03-08 09:23:58 -08:00
Bill Yi
8e6c5fb923 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I649ab74f81e39d61b37e6b8affcfe68951bb78ed
2021-03-08 08:35:46 -08:00
Victoria Lestari
026854ea4c Merge "VoiceInputHelper should not show recognition service if it's not selectable as default" into sc-dev 2021-03-08 16:34:22 +00:00
TreeHugger Robot
d53c640946 [automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b am: ebb056faff -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: I9b46618c94d1f4a0ed852f5f66d04cf57c3d7f13
2021-03-08 15:08:25 +00:00
Menghan Li
d4657b4c6b Merge "Update accessibility settings layout" into sc-dev 2021-03-08 14:54:21 +00:00
TreeHugger Robot
ebb056faff Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0e6becb72af1141d8cbcd814a55d34b4a171b1b
2021-03-08 14:26:28 +00:00
TreeHugger Robot
2c61777f4b Merge "Fix security issue" into rvc-qpr-dev 2021-03-08 13:43:50 +00:00