PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,322 Commits 1 Branch 0 Tags
cd5efe2f6d49027eb65ff3c8764e4271faf4d512
Commit Graph

82322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Li
cd5efe2f6d Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76 am: f54063e13b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091

Change-Id: I2badb3cffc24031ad6e095b7f022de71917cc84d
 2021-05-24 07:10:55 +00:00
Alex Li
f54063e13b Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675091

Change-Id: I62ae4000f3e385356a9074ec245aabd6911a8787
 2021-05-24 06:54:15 +00:00
TreeHugger Robot
3dd61863f5 Merge "Remove redundant learn more link" into sc-dev am: 2d31d85b5b am: e2cd6ad76b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682950

Change-Id: I0e9fb006f084ff617e04331d03057c4d08e527f8
 2021-05-24 06:45:35 +00:00
Edgar Wang
013f9c7696 Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe am: 41b13a34b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956

Change-Id: I76b50ab6b57b148ad6445f5c18b1345932f1c858
 2021-05-24 06:45:31 +00:00
TreeHugger Robot
8c4a3a6a0f Merge "Remove redundant learn more link" into sc-dev am: 2d31d85b5b am: cc67c27061 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682950

Change-Id: I4b0e05ed96d4d3d2883f81ac5356a4a49f02ebd8
 2021-05-24 06:38:16 +00:00
Edgar Wang
b26f5cc21d Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe am: f81739cdc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956

Change-Id: Ibf2f0364825458f979bd72b92891a7876ad0239c
 2021-05-24 06:38:11 +00:00
Alex Li
d647dece76 Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev 2021-05-24 06:32:09 +00:00
TreeHugger Robot
e2cd6ad76b Merge "Remove redundant learn more link" into sc-dev am: 2d31d85b5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682950

Change-Id: Ic062e5e46357d49c0758468c954c30829cb0aee9
 2021-05-24 06:22:37 +00:00
Edgar Wang
41b13a34b4 Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956

Change-Id: Idfbd77b165d0b43d230c6b37da5c1c8ae05659d5
 2021-05-24 06:22:30 +00:00
TreeHugger Robot
cc67c27061 Merge "Remove redundant learn more link" into sc-dev am: 2d31d85b5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682950

Change-Id: Ie112e390b3dae5a7ffdf8e0c9347e8d75f0b3d71
 2021-05-24 06:20:47 +00:00
Edgar Wang
f81739cdc6 Merge "Align the items in account sync page to the start border" into sc-dev am: 54aacf80fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682956

Change-Id: Ib728b7f4de24832630c8e28fe0b43d9a2cb45411
 2021-05-24 06:20:39 +00:00
TreeHugger Robot
2d31d85b5b Merge "Remove redundant learn more link" into sc-dev 2021-05-24 06:12:52 +00:00
Edgar Wang
54aacf80fe Merge "Align the items in account sync page to the start border" into sc-dev 2021-05-24 06:08:30 +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
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
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
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
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
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