Commit Graph

87492 Commits

Author SHA1 Message Date
Bill Yi
11d9d5023f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibd401397fed86b685cc30f9c0b6d5216ae8abd5c
2021-06-03 14:41:35 +00:00
Betty Chang
f1a1f241bf Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: b62f95a47a am: bc29f549de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I0115473744fbb8e2a4ee4bb35591497ec700acb7
2021-06-03 03:09:54 +00:00
Bonian Chen
4b0e2894f6 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 4cf2c2b10f am: 462aa78417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I47361cb904dc04309994c172365955a3e37dfefe
2021-06-03 03:09:37 +00:00
Betty Chang
bc29f549de Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: b62f95a47a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: Ie8c07f35ef6f159bcb45f0f73fd7c537ea7eeb96
2021-06-03 02:52:47 +00:00
Bonian Chen
462aa78417 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 4cf2c2b10f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I4ffe783d966166b248b54b00c81b5f1c7c24df66
2021-06-03 02:52:26 +00:00
Betty Chang
b62f95a47a Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I6de2cbcb0089500f1ce5fc689356a7a226c8cfe0
2021-06-03 02:33:50 +00:00
Bonian Chen
4cf2c2b10f Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: Iac562f776c021db8f8a59a29504f45fa96778b07
2021-06-03 02:33:32 +00:00
Betty Chang
227f9357ab Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev 2021-06-03 02:33:12 +00:00
Bonian Chen
b71dd1efd2 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev 2021-06-03 02:17:06 +00:00
TreeHugger Robot
80f315b677 Merge "Skip translations from sc-mainline-prod" 2021-06-02 22:43:35 +00:00
Kevin Chyn
0c8813a170 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 924105b7d8 am: a25dfa8f3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Iaa637e89407a7106249104a8bc6fa38bc573d73c
2021-06-02 20:57:26 +00:00
Kevin Chyn
a25dfa8f3b Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 924105b7d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: I64aaef936eb5b8d833fe8d6df75a4b7cf4d38c36
2021-06-02 20:41:39 +00:00
Kevin Chyn
924105b7d8 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ia28780a2596557e4e8028f6564734162f69d0086
2021-06-02 20:22:27 +00:00
Kevin Chyn
ef963fe079 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev 2021-06-02 20:03:38 +00:00
Trevor Black
5800cd5faf Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 220f6d734a am: ce308a645d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: I8a4f9de00136bc7a2c482f34237eabec5a1b3fca
2021-06-02 18:59:28 +00:00
Curtis Belmonte
d5a6692f0f Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 07b4452662 am: d602a9f4e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: I69dc280431e32fb9549a097629f00868b4a1eb1b
2021-06-02 18:59:16 +00:00
Trevor Black
ce308a645d Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 220f6d734a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: I356ae16f623ffa8ac800fd426f99f36ce802db62
2021-06-02 18:35:13 +00:00
Curtis Belmonte
d602a9f4e0 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 07b4452662
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: I0878526a39cc847bfcb82382b4e0c7c56c2197de
2021-06-02 18:34:36 +00:00
Trevor Black
220f6d734a Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: I8dd53d4e08b465acf7272c6c91338b2acd1f575f
2021-06-02 18:20:38 +00:00
Trevor Black
6c0a701540 Merge "Remove extra app info setting under specific condition" into sc-dev 2021-06-02 18:13:01 +00:00
Curtis Belmonte
07b4452662 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: Ifbbe941fe90343c6ec4c3885173417aca4874a1a
2021-06-02 18:09:46 +00:00
Curtis Belmonte
70dfd5332f Merge "Align assets and colors for biometric enroll intros" into sc-dev 2021-06-02 17:42:35 +00:00
Xin Li
cf811fc9bd Skip translations from sc-mainline-prod
Bug: 189946434
Change-Id: Id85df1e265289fcb5330866a46fad435093f71c1
2021-06-02 17:24:31 +00:00
Kevin Chyn
3d20bf93fd Fix array out of bounds in BiometricEnrollActivity
Bug: 189876828
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: I89f8ea1353cd9243c20c6184d579707da27e7b6f
2021-06-02 09:40:51 -07:00
Janis Danisevskis
2ed711c415 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6 am: c4f4a23061 am: 5f0cf0a91d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: I97d4369516d1277275411cd427c22f2dc01626d2
2021-06-02 16:30:39 +00:00
Janis Danisevskis
5f0cf0a91d Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6 am: c4f4a23061
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: Ifd7dfb5042ea47650be65430c3488160e904e590
2021-06-02 15:59:48 +00:00
Janis Danisevskis
c4f4a23061 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: I08dcd894056814ae72c3eee3721b8fdf399137d4
2021-06-02 15:37:07 +00:00
Janis Danisevskis
5abe3c9ea9 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: I6c2c2ee77f2a523c9a73475d8f49c0403eb2f65b
2021-06-02 15:35:17 +00:00
Janis Danisevskis
04fdd614b6 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev 2021-06-02 15:02:17 +00:00
TreeHugger Robot
141b129f14 Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8 am: 427aa9bddf am: 300a483c2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: I9bbd226f43015189a9b35b7acd1ec924b1af649c
2021-06-02 14:19:54 +00:00
TreeHugger Robot
300a483c2c Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8 am: 427aa9bddf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: Ifc311a3b306c6c63b24d504c7db5665dc8aa1cfe
2021-06-02 13:47:35 +00:00
TreeHugger Robot
b546afbd3f Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: I10efa3469be0788e09b922436eb0fbbf9604e061
2021-06-02 13:18:49 +00:00
TreeHugger Robot
5dec098361 Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d am: 0a035c52b2 am: 7746a0b42d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: I469d3480c087ce2af50533182c6f21de9ab27580
2021-06-02 13:18:44 +00:00
TreeHugger Robot
427aa9bddf Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: Ib8408006f2e329e7e8a5524de7b298dc81167941
2021-06-02 13:18:35 +00:00
TreeHugger Robot
55b577dff8 Merge "Remove silky flag from misc files" into sc-dev 2021-06-02 13:01:41 +00:00
TreeHugger Robot
7746a0b42d Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d am: 0a035c52b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: If8111f747f7d989cfec3324d377f19da9850cccb
2021-06-02 12:58:16 +00:00
TreeHugger Robot
4868370aa6 Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: I72f0fb842a1539bd8f922bd24a241441d3bd53ab
2021-06-02 12:34:03 +00:00
TreeHugger Robot
0a035c52b2 Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: I000322a25b172a188777e0ccb8aad4e23757bcb5
2021-06-02 12:31:47 +00:00
TreeHugger Robot
ea2b64a92d Merge "Remove silky flag for searching and help menu" into sc-dev 2021-06-02 12:07:44 +00:00
Yanting Yang
1aadccac6d Remove silky flag from misc files
Remove the silky condition.

Bug: 183670633
Test: robotests
Change-Id: I53cff0b149afb26d40f9b3af21c1b384058b306b
2021-06-02 19:11:12 +08:00
TreeHugger Robot
fe98750f42 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 am: 6b6823e526 am: e44a5ab02e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I73ccc81e7ed89d263afa680332097ebdca5c8b1a
2021-06-02 09:56:25 +00:00
TreeHugger Robot
c50ea039b6 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 am: 66a2e124ab am: f72fd2ba0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: I116bccf3495e76bfaaf4bd0153a776d5f790f728
2021-06-02 09:56:19 +00:00
TreeHugger Robot
e44a5ab02e Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 am: 6b6823e526
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I0512037ae777cbe0fbac6d8d6e72a66e8bec7170
2021-06-02 09:34:16 +00:00
TreeHugger Robot
f72fd2ba0f Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 am: 66a2e124ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: I54d4dfd61b882b2591d244752315228e7fda88c2
2021-06-02 09:34:12 +00:00
TreeHugger Robot
83af072e43 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: Id26ade86cfbb79abc6d1f260483e47d148e27180
2021-06-02 09:32:20 +00:00
TreeHugger Robot
6b6823e526 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I0ab7fd12d352df033c5420b361465653b9d2a695
2021-06-02 09:28:58 +00:00
TreeHugger Robot
7bebe57631 Merge "Fix slider RTL problem" into sc-dev 2021-06-02 09:20:12 +00:00
TreeHugger Robot
91dea2ca56 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: I0ee7963af8b0bfdf32711ada47923c70f929236e
2021-06-02 09:18:36 +00:00
TreeHugger Robot
66a2e124ab Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: Ie54b7323c0ba5665f7def9abe36c4f0884b55439
2021-06-02 09:15:58 +00:00
TreeHugger Robot
89fbeb6407 Merge "Fix voice access problem on location page." into sc-dev 2021-06-02 08:59:42 +00:00