Bill Yi
1f87d2d10d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours am: 56713ae05c -s ours am: 035f7580d6 -s ours am: 38b62cd4c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: I8fb4698d05f244e514ce97ce279ea09d46c9572f
2021-05-23 05:50:20 +00:00
Bill Yi
1b825e083e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours am: 56e7fa34f2 -s ours am: bc6c7adb9b -s ours am: ec3d3624a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: I46f583db3304535c29e3123e7717ec3f347b4351
2021-05-23 05:50:06 +00:00
Bill Yi
dfe26040f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours am: 56713ae05c -s ours am: 430a9a7aa5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: I8cff638008f3eba40c17985865ff96b425c1e6e9
2021-05-23 05:36:47 +00:00
Bill Yi
268ebbfdbc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours am: 56e7fa34f2 -s ours am: f11b0cc9cd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: I130b3602d2ea4b524481efd9640ce0f79d3bf2dc
2021-05-23 05:36:43 +00:00
Bill Yi
38b62cd4c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours am: 56713ae05c -s ours am: 035f7580d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: I3d3419c61f8fe204d327f03d97c0d41afbc53e98
2021-05-23 05:35:44 +00:00
Bill Yi
ec3d3624a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours am: 56e7fa34f2 -s ours am: bc6c7adb9b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: I9b34beed2a3c871b97c980ef2329a6698ee887f5
2021-05-23 05:35:36 +00:00
Bill Yi
430a9a7aa5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours am: 56713ae05c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: I88ea9f402a008ae52f84a01c13ba53de6b554e9b
2021-05-23 05:25:14 +00:00
Bill Yi
035f7580d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours am: 56713ae05c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: Ib33d3f60fa799a4b3d74e7cfe3431b15f45862be
2021-05-23 05:21:49 +00:00
Bill Yi
bc6c7adb9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours am: 56e7fa34f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: Ida96f79f3f74f5b660c5d13337663916bb706109
2021-05-23 05:21:45 +00:00
Bill Yi
56713ae05c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694266
Change-Id: Id9515df78a4b114d6fbcdda30732fc5141187207
2021-05-23 05:20:35 +00:00
Bill Yi
f11b0cc9cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours am: 56e7fa34f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: I4c9ede5ee05ac8ac272f48a77b34a06920b399b3
2021-05-23 05:18:42 +00:00
Bill Yi
56e7fa34f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694267
Change-Id: If57ebc6b440b41974f4303730be27814a10aabd0
2021-05-23 05:03:57 +00:00
Tim Peng
4d41945d77
[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest
...
-design changes and no battery icon
Bug: 188727945
bug: 188498118
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Ic5ebb3b5c06180090d54cd436c88c0bebe0d79f5
2021-05-22 13:39:25 +00:00
Bill Yi
fb9fbf219d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib996a2402a98bdfa5f1e0ba8550f89bc7a4ea2f9
2021-05-22 12:37:46 +00:00
Bill Yi
cbfc8c9e40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib0434b33264bc49e44dd206093ebfbb32e3484cc
2021-05-22 12:32:06 +00:00
Curtis Belmonte
1cb9a8c739
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c am: 502a18ddc9 am: 9cec3a4a99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: Ibdf4c4fc2ed470abb321fdf4f9bf2b110ba8e708
2021-05-22 00:23:23 +00:00
TreeHugger Robot
bc271f78ad
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f am: 2392ac66e1 am: 6dd4975bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: Id6dbae5bb56453c4b53ff0a301fe75aebb0c3618
2021-05-22 00:23:13 +00:00
Chen Xu
53a0efdcd3
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 569a14d0d9 am: b1a6641e88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: I4a3a4ae5aee15b0064ae5812308b2d5faf82035f
2021-05-22 00:23:08 +00:00
Curtis Belmonte
7f07c8394c
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c am: 35e4397090 am: 7a5d88069c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: I5d38919c30ba67400835f79b569fb48ade1fa080
2021-05-22 00:15:40 +00:00
TreeHugger Robot
24ed3ea495
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f am: fb4a0b5f55 am: b3c1cadd96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: Icb5e6f504bec3f6b379737d84b391c19d1bf7bb4
2021-05-22 00:15:29 +00:00
Chen Xu
555ab0593b
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 9cfc1d747e am: 55fac6d18b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: I92dc4add6f8c25801ba7669812f1c9a27afa487e
2021-05-22 00:15:21 +00:00
Curtis Belmonte
9cec3a4a99
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c am: 502a18ddc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: I3d71eb67a7fadf69bcec294770c8bbf324bf6d51
2021-05-22 00:10:18 +00:00
TreeHugger Robot
6dd4975bab
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f am: 2392ac66e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: I77219317976a7c0c422e4ed65d4a1d90a19c01bb
2021-05-22 00:10:05 +00:00
Chen Xu
b1a6641e88
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 569a14d0d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: Iea7c67cb437feeba0d4fbd0205b2bc2be790c159
2021-05-22 00:10:01 +00:00
Curtis Belmonte
7a5d88069c
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c am: 35e4397090
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: I80601c0320d14ff9ba8533bc0c40f339a4b0639a
2021-05-22 00:09:23 +00:00
TreeHugger Robot
b3c1cadd96
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f am: fb4a0b5f55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: I0143aaa35aaf3c7fa45e5c0aa1f3877b49cd5fbc
2021-05-22 00:08:43 +00:00
Chen Xu
55fac6d18b
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 9cfc1d747e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: I621b0892368bdb836b1992a2110a7b2965496630
2021-05-22 00:07:44 +00:00
Curtis Belmonte
35e4397090
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: I1b7b0bfae78f13d1feba7692002c6bfa0676a8e5
2021-05-21 23:58:32 +00:00
TreeHugger Robot
fb4a0b5f55
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: I4e80807e8989b21fde931205e51c7da977d85647
2021-05-21 23:57:03 +00:00
Chen Xu
9cfc1d747e
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: I50d27fa8a90cba1ba2fbea021338a8ba50d08e0e
2021-05-21 23:55:18 +00:00
Curtis Belmonte
502a18ddc9
Merge "Update Face Unlock strings to the latest versions" into sc-dev am: 0327293c3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14556880
Change-Id: Id98a29e882fad49d4629bf34f8b1ada75e288b1f
2021-05-21 23:52:36 +00:00
TreeHugger Robot
2392ac66e1
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev am: c8b025cc7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682085
Change-Id: I6526b369a98d59f31788d3bc02357947cb43d646
2021-05-21 23:52:07 +00:00
Chen Xu
569a14d0d9
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209
Change-Id: Iace3a9e910d0b623f571d51f9b505f4878f69ce7
2021-05-21 23:51:57 +00:00
Curtis Belmonte
0327293c3c
Merge "Update Face Unlock strings to the latest versions" into sc-dev
2021-05-21 23:40:40 +00:00
TreeHugger Robot
c8b025cc7f
Merge "Prevent duplicate lock confirmation in face & fingerprint settings." into sc-dev
2021-05-21 23:34:55 +00:00
Chen Xu
ed23483ca7
Merge "integrate config_disable_all_cb_messages to settings" into sc-dev
2021-05-21 21:21:19 +00:00
Joe Bolinger
eb5fd6ec30
Prevent duplicate lock confirmation in face & fingerprint settings.
...
Wait for all extras to be available before launching the next activity.
Fix: 187005993
Test: manual (open face/fp settings & verify only asked for PIN once)
Change-Id: I9e3f46d5750b11ab0773d08d44908d3e9703ca42
2021-05-21 20:55:11 +00:00
Curtis Belmonte
47d74ccfd7
Update Face Unlock strings to the latest versions
...
Makes the following changes to strings related to Face Unlock:
- Standardize capitalization of "Face Unlock"
- Use latest versions of traffic light face enroll strings
- Use latest versions of combined biometrics settings strings
- Set SUW description strings programmatically instead of in XML
Test: Manually tested Face Unlock traffic light and grid UIs
Bug: 183649070
Change-Id: Ie67978ae2630493a5b03b00c3f8a639066ab8f3a
2021-05-21 13:11:52 -07:00
Edgar Wang
de88f5244c
Update Policy transparency dialog to new style
...
- Tweak layout
- Update app icon
- Update font Size
Bug: 188756125
Test: manual
Change-Id: I7ddd73c80ead95d57202d1753408b437611a76b4
2021-05-22 04:00:38 +08:00
TreeHugger Robot
64e231e65f
Merge "Should not show top intro in search" into sc-dev am: c102420acb am: 4beba74dce am: 192d286c8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: I76ac3fa8590a3718daa591b8b5947ce7b11e64e8
2021-05-21 19:30:36 +00:00
TreeHugger Robot
1b2cd3d831
Merge "Should not show top intro in search" into sc-dev am: c102420acb am: f79fc1f455 am: af3db3f5d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: I12657a830ea5258a0de2698a7b22e43bec95f321
2021-05-21 19:29:47 +00:00
TreeHugger Robot
192d286c8f
Merge "Should not show top intro in search" into sc-dev am: c102420acb am: 4beba74dce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: Ie1cb500d9dd4a4a505e230bb07c4d03871aceacc
2021-05-21 18:43:47 +00:00
TreeHugger Robot
af3db3f5d2
Merge "Should not show top intro in search" into sc-dev am: c102420acb am: f79fc1f455
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: I7a4df0d5ca269e70bbc89e6b470c53ca4a0b72d1
2021-05-21 18:41:56 +00:00
TreeHugger Robot
4beba74dce
Merge "Should not show top intro in search" into sc-dev am: c102420acb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: Ie1377af08c07763c95f94ed56085223fb5fc88cb
2021-05-21 18:26:58 +00:00
TreeHugger Robot
f79fc1f455
Merge "Should not show top intro in search" into sc-dev am: c102420acb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14646256
Change-Id: If189fb98a17d9776e9d180631d1440eba753caea
2021-05-21 18:26:51 +00:00
TreeHugger Robot
c102420acb
Merge "Should not show top intro in search" into sc-dev
2021-05-21 18:02:21 +00:00
Mill Chen
8dfa74f6b8
Remove redundant learn more link
...
Fix: 188579822
Test: visual verified
Change-Id: If542976f8d04db5e3bab13da248c555caf75638f
2021-05-22 01:46:39 +08:00
Quang Luong
74439880a1
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d am: 4921f2fd3c am: 1f3c9c1295
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: Ie7dd3ea53bed9e957d56c2a03382267d7f7e92f2
2021-05-21 17:46:09 +00:00
Quang Luong
26f4bf4cf3
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d am: bc39d7bd0b am: 1af183e8a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: Ida62f263cb4cbf6eb9de67ad2f301f45458bd69c
2021-05-21 17:45:51 +00:00
TreeHugger Robot
50d859a304
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a am: 61ea520982 am: fcb9894295
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: I49b0def6c58c280a18153957b2e62553ac84ecf2
2021-05-21 17:45:38 +00:00