Commit Graph

91032 Commits

Author SHA1 Message Date
Peter Wang
94d612267f 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: Iacbc657322bba98d92865273de5efdf7a6613422
2021-06-30 07:02:23 +00:00
TreeHugger Robot
1926d76db9 Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b52d am: b0d13fdba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

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

Change-Id: I22278d14c83613251393588b322b7e8efe8a91f7
2021-06-30 07:00:16 +00:00
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
TreeHugger Robot
f85fe536f8 Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b52d am: 5e853f90bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

Change-Id: I693e5b04aa029d8765a429a908d5ef0bc7389678
2021-06-30 06:59:42 +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
5e853f90bc 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: I3cba5fdd196d5b5d2206e8643c78567cb02b4a82
2021-06-30 06:47:53 +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
Stanley Wang
80bcf71522 Change the illustration in one-hand mode page. am: 913fbf7e0c am: bab0604a1c am: a2c2610083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

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

Change-Id: I1c97cc3df9c8d369656839f117f5c7c53139cbf7
2021-06-30 06:44:43 +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
e6ff7ab434 Change the illustration in one-hand mode page. am: 913fbf7e0c am: b33b1640e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: Ia0c71f2f7b003b196086717c159eb3c059b68bb0
2021-06-30 06:26:55 +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
b33b1640e8 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: Icc5f2653da5167968aa7ef20d994400226e13427
2021-06-30 06:11:52 +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
8f1121ada9 Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131 am: 6cf9f75c0a am: cad3e59719
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

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

Change-Id: Ieb0934622a8aedaa12156958750eedf1624926e6
2021-06-30 01:15:08 +00: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
35373bf94e Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131 am: aeb28e87f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

Change-Id: I2f8de8fbd589df6b9ecdb7048e11c7ddca69264a
2021-06-30 01:07:03 +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
aeb28e87f4 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: I6f8a3888467d52df1a7d6c88160bfa8846736984
2021-06-30 00:48:44 +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
651f6f11b1 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 am: 180d88d05d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15128709

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

Change-Id: I2e8e633a17e307e0b5a41d1c979c5f57e410a483
2021-06-29 23:03:29 +00:00
Automerger Merge Worker
5830bf552a Merge "Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e am: a0413849ee" into sc-v2-dev-plus-aosp am: ad2dc33f6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140321

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

Change-Id: Id735641e374513147acc3246baceb0b5bff87c35
2021-06-29 23:02:59 +00: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
55ffe13fbd Merge "Reword "Internet won't autoconnect" to "Mobile data won't autoconnect"" into sc-dev am: f8d5f8ca54 am: 4b973d74f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15128709

Change-Id: Ie6b2eddd2162805c3f8c8efb393092b5995926e1
2021-06-29 22:48:34 +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
5fde00d783 Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c3919e am: 80a62d6d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140321

Change-Id: I06e2a71677004c488ef20bdb3a3d75ae86cab8d4
2021-06-29 22:48:27 +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
4b973d74f2 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: Ic66bb17f6c67b5e3bcccf2c5926101fdd182eb21
2021-06-29 22:32:50 +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
80a62d6d90 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: If9d948d17bd6dcdb5dd872f674cc8c8ceae2e2a4
2021-06-29 22:32:42 +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