Commit Graph

87709 Commits

Author SHA1 Message Date
TreeHugger Robot
ee8560df89 Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: 14c2dfadb0 am: ce2c5fcebe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: I17188282add961d6f25c2d29e48b8cf41263fc82
2021-05-24 04:15:41 +00:00
Ryan Lin
807915722e Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: f8688671f7 am: 09f73edb4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I511e04cbf7f32ae3ef061dc2ba5391296bf5bd78
2021-05-24 04:15:35 +00:00
TreeHugger Robot
86947a85a9 Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: e250b21c41 am: bbb887c51b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: Ib9e275c4fe7defe4564ba73066488327e706e399
2021-05-24 04:15:24 +00:00
Ryan Lin
2baabd3a14 Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: 0753ba3e8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: Ide0770b96779f777fc54bcaf7be60feb2700f4e7
2021-05-24 04:00:16 +00:00
TreeHugger Robot
ce2c5fcebe Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: 14c2dfadb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: I48c13bb1b81793e48542a34b7e2986e740086ce3
2021-05-24 04:00:11 +00:00
Ryan Lin
09f73edb4e Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: f8688671f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I81e7cbc3fb7249c073fc854236bfc2c5e198f1e9
2021-05-24 03:59:00 +00:00
TreeHugger Robot
bbb887c51b Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d am: e250b21c41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: I20a03bc69fb7ae990b1af8d2ff8676adf159b3d7
2021-05-24 03:58:55 +00:00
Ryan Lin
0753ba3e8b Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I9c98831688f1fd743723bb54e672ee99d1fd0b5b
2021-05-24 03:49:17 +00:00
Ryan Lin
f8688671f7 Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: Ie1ea496961f4cab91779fd92558b7d1b5d4db4a5
2021-05-24 03:45:26 +00:00
TreeHugger Robot
e250b21c41 Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: I8de13c57801126caf208d8acc102a81dce4ffe2a
2021-05-24 03:45:20 +00:00
Ryan Lin
3e1617bf54 Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I7c351a89e9cbce8a7378251bb5e01c38e365d4ed
2021-05-24 03:43:35 +00:00
TreeHugger Robot
fe248ea8cf Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: I3120217bff3c510bcd5ad6d49b4c81d935c80447
2021-05-24 03:43:30 +00:00
Ryan Lin
31389702ad Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev 2021-05-24 03:41:39 +00:00
TreeHugger Robot
14c2dfadb0 Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682951

Change-Id: Ib26fc131216d2c423c176be6a0ec2a3e7de20f27
2021-05-24 03:40:15 +00:00
TreeHugger Robot
9081a2e67d Merge "Update Policy transparency dialog to new style" into sc-dev 2021-05-24 03:28:04 +00:00
Pasty Chang
fbf5506b86 Migrate summary text in wifi QR scan page to DescriptionMixin
The description in the setup flow would follow the new style to align to the left.

Bug: 188593594
Test: atest & manual
Change-Id: Idfc00f51710d725d5c653396902446f29861cb88
2021-05-24 03:24:26 +00:00
TreeHugger Robot
800b100ea8 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922 am: eb89ceba91 am: 04fb86cefd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: I96b57475a42a25f2d915b776255cf5bd4c08f610
2021-05-24 02:59:48 +00:00
TreeHugger Robot
12086bbf87 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922 am: 4d1e51f872 am: 22c7ad25a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: Ibe25bf8dce29ff16d5e01ceae37d2b02033a0a59
2021-05-24 02:59:41 +00:00
TreeHugger Robot
04fb86cefd Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922 am: eb89ceba91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: I160847aedb4b0f32cdf4f09bb80b399e4d420a40
2021-05-24 02:45:00 +00:00
TreeHugger Robot
22c7ad25a5 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922 am: 4d1e51f872
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: I8fa9e376599bcc921dbd0d33925fade591c341a1
2021-05-24 02:43:54 +00:00
TreeHugger Robot
4d1e51f872 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: I93472fb8aaa4331f0d691ef761fb3e065ad22483
2021-05-24 02:30:22 +00:00
TreeHugger Robot
62023607ed Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: I9a3e42947a8681793ee278f228f3963d03b68e09
2021-05-24 02:28:28 +00:00
TreeHugger Robot
eb89ceba91 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 24f2dda922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682952

Change-Id: I63f94e78f1ea5bf770d1fba820d3b04ad87af33a
2021-05-24 02:26:53 +00:00
TreeHugger Robot
24f2dda922 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev 2021-05-24 02:15:08 +00:00
Jason Chiu
4b1d1e21d5 Align the items in account sync page to the start border
The prefernces haven't been applied to the SettingsLib preference theme
which sets iconSpaceReserved false.

Fixes: 187670431
Test: visual, robotest
Change-Id: Ifa797fbec4f207248fd0254e26d456b8889e25d8
2021-05-24 10:13:53 +08:00
Bill Yi
a04ae7cc78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc8c9e40 -s ours am: 56713ae05c -s ours am: 430a9a7aa5 -s ours am: dfe26040f5 -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: Ic041dc194fb3a7c3b8f7c23929403e29b360de1e
2021-05-23 05:50:36 +00:00
Bill Yi
1ddf3cb342 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb9fbf219d -s ours am: 56e7fa34f2 -s ours am: f11b0cc9cd -s ours am: 268ebbfdbc -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: Iddeb19824fef3d5b9ab6924d73f69ded7858cd9b
2021-05-23 05:50:31 +00:00
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
f1e3313fa2 [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: I266ba1baa30d3817579ce1b6019664338a11eefd
2021-05-23 05:27:22 +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
106c6c499a [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: Ia5e245a2b0f015c2ff79b20416db5e487f264392
2021-05-23 05:20:05 +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