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
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
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
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
867384001c
Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
am: c0aab4416a
am: 537027ff80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946
Change-Id: I0fc17f789dd7aab542a8453461b2d117eb11aefd
2021-06-29 19:38:09 +00:00
TreeHugger Robot
516138ec37
Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
am: 6c992bf629
am: 1b07b30a26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946
Change-Id: I35fa1ab9891ab036f931db927242ac0bbd0248b1
2021-06-29 19:35:03 +00: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
2171d72c0d
Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1
am: aa3e4f7348
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946
Change-Id: I710c1878e60bf6f0fb09888752e5d9b033849cfe
2021-06-29 19:25:31 +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
aa3e4f7348
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: Ic3d9f718a805574a292ccb735ae9e80f660f31c1
2021-06-29 19:04:26 +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
b894c36d5b
Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
am: d8ab97081b
am: 5a67cd9bf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190
Change-Id: I526cffc4addd24ec355f5c087befb95682d2ef3c
2021-06-29 16:37:23 +00:00
Jan Tomljanovic
95751ee673
Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
am: 1384459fde
am: fcf8555515
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190
Change-Id: I801ed594f0a51ed138bb0a413dfe52b74996bbc8
2021-06-29 16:35:54 +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
9d7cff7532
Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
am: b91878940e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190
Change-Id: Ieb4978ed3d1467afaff9473a7cceb34d3dcca002
2021-06-29 16:26:46 +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
b91878940e
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: I97627ab436e0fd93b65a473b4fd6e86f009887f0
2021-06-29 16:18:16 +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