Commit Graph

85572 Commits

Author SHA1 Message Date
TreeHugger Robot
bb0b80c55d Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b52d am: e19759b6ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

Change-Id: I9f488fd6b8fadbafc91f2fd20e4d273826da9746
2021-06-30 07:00:11 +00:00
Peter Wang
249c3677d3 Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" into sc-dev am: baecf00ce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140324

Change-Id: Id1c48c2db818bba69fcbf1e5766ed1dc9266edca
2021-06-30 06:55:01 +00:00
Peter Wang
baecf00ce2 Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" into sc-dev 2021-06-30 06:52:43 +00:00
TreeHugger Robot
e19759b6ab Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b52d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

Change-Id: I72a317e62bff33ea10ed93950cd927c7b1c9a101
2021-06-30 06:48:38 +00:00
TreeHugger Robot
b0d13fdba4 Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b52d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

Change-Id: I30e91b8c3815045c4069d7709dc94a43b9fb4cee
2021-06-30 06:47:41 +00:00
TreeHugger Robot
d8cd67b52d Merge "Password settings: Fix duplicate title" into sc-dev 2021-06-30 06:35:33 +00:00
Stanley Wang
a2c2610083 Change the illustration in one-hand mode page. am: 913fbf7e0c am: bab0604a1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: Ie54e953b7be8fb1bdf22473719a97401a7e1a147
2021-06-30 06:28:24 +00:00
Stanley Wang
7d692e89e0 Change the illustration in one-hand mode page. am: 913fbf7e0c am: 44a2f596e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: Ie85a04acb00e94d76aa7b57d8137c76f7552a8a7
2021-06-30 06:27:20 +00:00
Stanley Wang
bab0604a1c Change the illustration in one-hand mode page. am: 913fbf7e0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: I0adf06ecf101a3d123e811380db41d6df4a4aaee
2021-06-30 06:12:57 +00:00
Stanley Wang
44a2f596e2 Change the illustration in one-hand mode page. am: 913fbf7e0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: I92aa51a281c60ec0a2931db206b3b17ee2901acb
2021-06-30 06:12:56 +00:00
Stanley Wang
913fbf7e0c Change the illustration in one-hand mode page.
- Different one-hand modes need to display different illustrations.

Fix: 191334556
Test: rebotest and see the UI
Change-Id: Id6edba40142e008c618fdb3536424edd2b77f9b0
2021-06-30 13:47:34 +08:00
PETER LIANG
cad3e59719 Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131 am: 6cf9f75c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

Change-Id: I2c201cb6efb9a8e0cfadb87a8088b5d668305055
2021-06-30 01:08:32 +00:00
PETER LIANG
3248086b7c Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131 am: f5f46ec78b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

Change-Id: I9ac4bf3e9d67bfcfadd9685b47a17811780b0e64
2021-06-30 00:57:33 +00:00
PETER LIANG
6cf9f75c0a Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

Change-Id: Ied0fbfa9439b2731c973dc3444e4d3db62c9f96d
2021-06-30 00:48:40 +00:00
PETER LIANG
f5f46ec78b Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

Change-Id: I31ba59f5dd59b37afb945080bf0f4d83cdfc3aba
2021-06-30 00:47:09 +00:00
PETER LIANG
1a77fce131 Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev 2021-06-30 00:38:20 +00:00
Ahaan Ugale
437c037830 Password settings: Fix duplicate title
For the autofill service settings, "Autofill service" is both the
section title and the preference title. This change removes the
duplicate preference title and promotes the app label from the summary
string to the title in its place.

Fix: 192403526
Test: manual - single profile, personal+work profile, change service and
 re-check
Change-Id: Ia012232ba2856e0757289982bc3045d948ff4aa8
2021-06-29 17:21:01 -07:00
Automerger Merge Worker
180d88d05d Merge "Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev am: f8d5f8ca54 am: d804bf33f2" into sc-v2-dev-plus-aosp 2021-06-29 22:48:37 +00:00
Quang Luong
acdb293411 Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev am: f8d5f8ca54 am: d804bf33f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15128709

Change-Id: I9df68385210ff2127620706f8292e3a1f8c369a7
2021-06-29 22:48:34 +00:00
Quang Luong
ebc5d3911a Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev am: f8d5f8ca54 am: 2c4980a9fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15128709

Change-Id: I66b1d1db6689262b7afb8431d81d90a1a0cf265d
2021-06-29 22:48:33 +00:00
Automerger Merge Worker
ad2dc33f6c Merge "Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e am: a0413849ee" into sc-v2-dev-plus-aosp 2021-06-29 22:48:32 +00:00
TreeHugger Robot
8ca4274f3c Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e am: 85dcbd549b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140321

Change-Id: I9303e3d4d330ab0e4e18f3fd280a64ff98753eca
2021-06-29 22:48:28 +00:00
TreeHugger Robot
18f733a5eb Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e am: a0413849ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140321

Change-Id: Icddb3416a5f254d7235729487e88c45081d3f670
2021-06-29 22:48:27 +00:00
Quang Luong
2c4980a9fc Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev am: f8d5f8ca54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15128709

Change-Id: Ic6a996e9a5aaf1761dc34f9d8a262602e972709b
2021-06-29 22:33:35 +00:00
TreeHugger Robot
85dcbd549b Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140321

Change-Id: I980ccde62c6e3ca88f641221486320c77a305c95
2021-06-29 22:33:28 +00:00
Quang Luong
d804bf33f2 Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev am: f8d5f8ca54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15128709

Change-Id: I95e4b030f97217711f9f3acaf38d0c96094b4e37
2021-06-29 22:32:46 +00:00
TreeHugger Robot
a0413849ee Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140321

Change-Id: I0c40126a8a27b3bf4be7b8ef44abba139c3286e0
2021-06-29 22:32:37 +00:00
Quang Luong
f8d5f8ca54 Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev 2021-06-29 22:29:58 +00:00
TreeHugger Robot
ca61c3919e Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev 2021-06-29 22:20:03 +00:00
Peter Wang
eba8857094 Add a cancel string for ToggleSubscriptionDialog to handle Tamil
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
2021-06-29 15:08:00 -07:00
Curtis Belmonte
218187bcce Fix buttons and icons for fingerprint enroll intro
Updates the labels of buttons and the colors of icons shown on the
fingerprint enroll intro screen to be consistent with the face enroll
intro screen and match the latest mocks.

Note that this commit removes some unused strings but does not add any
new ones requiring l10n.

Test: Manually tested face enroll from Setup Wizard and Settings

Fixes: 192381823
Change-Id: Id991d4f29d6de82acd538f1853bc8a5e50cd2637
2021-06-29 14:05:27 -07:00
TreeHugger Robot
537027ff80 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: c0aab4416a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: Ia977ddd12de0760ecbd7089478f06f0d6a7a032d
2021-06-29 19:26:42 +00:00
TreeHugger Robot
1b07b30a26 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: 6c992bf629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I6e77669335096aa09605e461a6a056f223a1140d
2021-06-29 19:25:30 +00:00
TreeHugger Robot
c0aab4416a Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: Ifc37331783f90bbb921d1eedaba9c8272a192e33
2021-06-29 19:07:51 +00:00
TreeHugger Robot
6c992bf629 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I0504cef773ca14ff7f4b9d38a60d1e8a274c024a
2021-06-29 19:06:46 +00:00
TreeHugger Robot
b36bbc55d1 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev 2021-06-29 18:55:24 +00:00
Jan Tomljanovic
5a67cd9bf2 Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: d8ab97081b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: Ic16390ae04fa0cfd939a0e860669b7a87c4a4adc
2021-06-29 16:27:17 +00:00
Jan Tomljanovic
fcf8555515 Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: 1384459fde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: Ia52adebb133935e95e66696da0fe530694a72d7d
2021-06-29 16:26:56 +00:00
Jan Tomljanovic
1384459fde Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: I310df83f7a96e4f12c559ff47cf6b595c5c5291d
2021-06-29 16:19:00 +00:00
Jan Tomljanovic
d8ab97081b Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190

Change-Id: If128e463dd8d4886d94bd41ed457b8c02eac8e93
2021-06-29 16:18:13 +00:00
Jan Tomljanovic
2b8678c5d4 Merge "Enable controllers to use a custom key." into sc-dev 2021-06-29 16:02:55 +00:00
TreeHugger Robot
b1c41c0b61 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ed8c6b358b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I0f91d3ca23c16548d9f3dc94d6c67e036636aa4b
2021-06-29 13:40:26 +00:00
TreeHugger Robot
930ca026db Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 0c0eb5e6e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Icfe588c89b66080d3799a16591d4411dd99f9315
2021-06-29 13:40:20 +00:00
TreeHugger Robot
7e987da903 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 31abfa4b1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I983f6e8adaa06d6143b59bb835ea38c549a089b3
2021-06-29 13:40:05 +00:00
TreeHugger Robot
825811a9b4 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ba2a3a8e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I902c54716904c50c9e782a2d90f1c600a27823c0
2021-06-29 13:39:38 +00:00
TreeHugger Robot
5ec625631b Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 19fe74f9af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Ic95449de889dab619bd64021e6ff75a39ee59756
2021-06-29 13:39:35 +00:00
TreeHugger Robot
a6c8b9f837 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359 am: 61c5877a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I9806c7a00dac4321f84a599822524f91f604d842
2021-06-29 13:39:30 +00:00
TreeHugger Robot
ba2a3a8e09 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I86985727346a7c0e6cfd3e8876d9b6b5a5541809
2021-06-29 13:26:14 +00:00
TreeHugger Robot
19fe74f9af Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Ib48c4e0e5a1199702bec018e79d043c9cbe89f6b
2021-06-29 13:26:10 +00:00
TreeHugger Robot
61c5877a26 Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727

Change-Id: I6330137e9a33d7eea27b6a2993571c6c611528bc
2021-06-29 13:26:05 +00:00