Commit Graph

85166 Commits

Author SHA1 Message Date
YUKAI HUNG
f48cf35a81 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: c11960a427 am: 5e963c6600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: Ifddb42d47191eb63a4b516e7e98bc5076bcde304
2021-05-24 12:28:44 +00:00
YUKAI HUNG
5e963c6600 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: c11960a427
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: Idfb6661a1efc762417133651c86b1e913e528fbe
2021-05-24 12:08:13 +00:00
YUKAI HUNG
c11960a427 Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I6576ce630a72df6db5d54de460fc3fe09d6dd539
2021-05-24 11:54:29 +00:00
YUKAI HUNG
648f773c7c Merge "Move load battery consumer icon and label into the background" into sc-dev 2021-05-24 11:41:18 +00:00
Betty Chang
aab810026a Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: 2a5f886ad4 am: 4dd0a2dbe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

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

Change-Id: I092cadfd258c5bc718fca6b93f3bfedf12271065
2021-05-24 07:26:14 +00:00
Betty Chang
7b6ac5b5f9 Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e am: 82b402fb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

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

Change-Id: I441dcb7c793909a9a1f9fef3cd2acd6550913166
2021-05-24 07:25:31 +00:00
Betty Chang
4dd0a2dbe2 Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: 2a5f886ad4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

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

Change-Id: I82f583af63b64bfdf987633b6b4c73abd6ae8098
2021-05-24 07:12:10 +00:00
Betty Chang
82b402fb4c Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: I13b9036bc456124600a2917656000aadd8d26e25
2021-05-24 07:11:07 +00:00
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
Betty Chang
a76c6efc0e Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: I51b2c94a72c518104d40a5106398d99bdc38ef17
2021-05-24 06:54:20 +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
14e720e747 Merge "Remove redundant learn more link" into sc-dev am: 2d31d85b5b am: e2cd6ad76b am: 3dd61863f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682950

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

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

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

Change-Id: I373b24691226d79449a358fb07cf6492c901f2e8
2021-05-24 06:52:26 +00:00
Betty Chang
2a5f886ad4 Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: I2f2c5e24384f5302fa61c7682f0fd961dfdde2ab
2021-05-24 06:51:05 +00:00
Alex Li
84e503f57f 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: Ie266b69270ab3c64659ce9df4ea80a1bb0a4bc81
2021-05-24 06:50:51 +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
Betty Chang
4246049c7c Merge "Remove the Network rating provider item" into sc-dev 2021-05-24 06:42:10 +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
ykhung
3ad391b0de Move load battery consumer icon and label into the background
move high latency icon and label loading into the background thread to
improve the performance and first frame response time, which is also the
pre-work for checking whether a item is tappable or not feature (will
work this on the next patch)

Bug: 188751551
Test: make SettingsgRoboTests
Change-Id: I4e5712e995fce055d2735135c28be60fb70e5796
2021-05-24 13:57:14 +08:00
Ryan Lin
01a7c95f1e Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev am: 31389702ad am: 0753ba3e8b am: 2baabd3a14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515928

Change-Id: I1ab87e1ffd7c35eea9b9cc0bff64c57679863a25
2021-05-24 04:15:46 +00:00
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
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
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