Stanley Wang
ae12bc8099
Merge "Update Adaptive connectivity page." into sc-dev am: 8cd20c0bb1
am: ed28ce2c0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142232
Change-Id: Ia000ccdbc70177a30e38692d80a051db9919e508
2021-06-30 09:51:29 +00:00
PETER LIANG
8b6740b83b
Merge "Update the material next style for the banner of Auto Click." into sc-dev am: c4176b73e0
am: 5ed90daed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153298
Change-Id: If4501f128bc5526e04e7db87f0bb0a2792dc3e3b
2021-06-30 09:51:20 +00:00
Stanley Wang
8eafccf610
Merge "Update Adaptive connectivity page." into sc-dev am: 8cd20c0bb1
am: cb3626eaf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142232
Change-Id: Id0a9027af06f75fe0ecfe138ae991dea911e6e70
2021-06-30 09:51:13 +00:00
PETER LIANG
5ed90daed0
Merge "Update the material next style for the banner of Auto Click." into sc-dev am: c4176b73e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153298
Change-Id: I08278c201a5a0f18715b51ff1a45fb0cef19ecf8
2021-06-30 09:42:47 +00:00
PETER LIANG
c4176b73e0
Merge "Update the material next style for the banner of Auto Click." into sc-dev
2021-06-30 09:39:41 +00:00
Peter_Liang
1eba90f572
Update the material next style for the banner of Auto Click.
...
Action:
Apply the illustrationPreference from SettingsLib to the banner.
Bug: 190585192
Bug: 192413239
Test: manual test
Change-Id: I7d78804b4fa89735edfb73f01f31771821bcd8c2
2021-06-30 09:39:23 +00:00
Stanley Wang
cb3626eaf1
Merge "Update Adaptive connectivity page." into sc-dev am: 8cd20c0bb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142232
Change-Id: I9d2df7a84dd4bf2b2d9b368f4e8e78d2be3dcb28
2021-06-30 09:37:19 +00:00
Stanley Wang
ed28ce2c0a
Merge "Update Adaptive connectivity page." into sc-dev am: 8cd20c0bb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142232
Change-Id: Id3fd4456a5024c613ce33e4fe85a20bb1dfb721b
2021-06-30 09:36:25 +00:00
Stanley Wang
8cd20c0bb1
Merge "Update Adaptive connectivity page." into sc-dev
2021-06-30 09:23:51 +00:00
Stanley Wang
e722fbe277
Update Adaptive connectivity page.
...
- Use MainSwitchPreference.
- Use the TopIntroPreference to display the summary.
- Use the IllustrationPreference to display the stastic
illustration.
- Add new illustrations for adaptive connectivity.
Fix: 178673083
Test: robotest and test the switch preference manually
Change-Id: I2376f4433b61ce1d3da287de92660fbeea5dd64e
2021-06-30 16:12:17 +08:00
Peter Wang
a66e37b491
Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" into sc-dev am: baecf00ce2
am: 94d612267f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140324
Change-Id: Ifc99fef6b1b3461e104cf592b97e9ca94c53de83
2021-06-30 07:04:33 +00:00
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
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