Commit Graph

82364 Commits

Author SHA1 Message Date
Ryan Lin
c535b36b45 Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96 am: e833c3681f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751

Change-Id: Id895f277287223d69ef40a8828c7e7682f03b4d3
2021-05-25 02:24:27 +00:00
Ryan Lin
e833c3681f Merge "Correct punctuation for inconsistency" into sc-dev am: 954389be96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702751

Change-Id: If32d099b7591ee13a0473e11534956d3fd95c42c
2021-05-25 02:08:24 +00:00
Ryan Lin
954389be96 Merge "Correct punctuation for inconsistency" into sc-dev 2021-05-25 01:48:30 +00:00
Menghan Li
ff6ffc4727 Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649 am: 0341e42c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750

Change-Id: I0454f9cb3047d63d9925213911d2b5ec07f75735
2021-05-24 22:33:13 +00:00
Menghan Li
65de58eb41 Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649 am: 06f1a6179d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750

Change-Id: I6be87d3ef9c631df05cd0a17c7978af0f98450bd
2021-05-24 22:26:06 +00:00
Menghan Li
0341e42c54 Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750

Change-Id: Ib243220845f6b57a888eb84786806ae0422cbd4c
2021-05-24 22:10:46 +00:00
Menghan Li
06f1a6179d Merge "Apply color extraction for sub settings in SuW" into sc-dev am: 49f904c649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702750

Change-Id: I4ae751cf7f0be3d633d2a557cf2fdaa14a072132
2021-05-24 22:07:05 +00:00
Menghan Li
49f904c649 Merge "Apply color extraction for sub settings in SuW" into sc-dev 2021-05-24 21:48:38 +00:00
Julia Reynolds
a010ebc2d6 Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d am: 7f79c1b475
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666

Change-Id: I23a068bba98847b99c4cec1db1257a74a183d283
2021-05-24 19:10:13 +00:00
Julia Reynolds
c863e32a64 Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d am: 7bff80dec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666

Change-Id: I112aa70b50b88e4373178784845fd5dfc189bf95
2021-05-24 19:08:23 +00:00
Julia Reynolds
7bff80dec9 Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666

Change-Id: I4a84c20a2e759b59294556a02d4f85484656274d
2021-05-24 18:52:10 +00:00
Julia Reynolds
7f79c1b475 Merge "Improve entrance animations on convo page" into sc-dev am: a5b242ec3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702666

Change-Id: Ie1a1df7b7e1d7b3a62d07754256f63424b1a495c
2021-05-24 18:50:51 +00:00
Julia Reynolds
a5b242ec3d Merge "Improve entrance animations on convo page" into sc-dev 2021-05-24 18:32:03 +00:00
Jason Hsu
06029c0178 Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1 am: 47d51164bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: Ibf7592f8161a3c9166d140ef08f3933f0c92fe6c
2021-05-24 18:08:22 +00:00
Jason Hsu
a1b368ce6a Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1 am: 5bbc6c267c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: I37d81caad81bb72d8918084f7f0bd7b0d11158a9
2021-05-24 18:06:26 +00:00
Jason Hsu
5bbc6c267c Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: Ia40252fe4beb9236e1cf2cd1f6097902b8f4abd1
2021-05-24 17:52:17 +00:00
Jason Hsu
47d51164bc Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev am: 9fac24c1a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682953

Change-Id: Ie771746c7111a07f16c457b36a7b097bd346dfc2
2021-05-24 17:48:11 +00:00
Jason Hsu
9fac24c1a1 Merge "Fix transparency seekbar in accessibility button page is backwards" into sc-dev 2021-05-24 17:34:46 +00:00
TreeHugger Robot
e84eb86194 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5 am: ba86da86c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: I1f12e73313958ae541eefccf6df8c5cda77e7ac8
2021-05-24 17:00:31 +00:00
TreeHugger Robot
dc93fdf0c4 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5 am: ecfd6714d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: I44a8943d145e44027720feada8c4354d6587dc77
2021-05-24 16:52:34 +00:00
TreeHugger Robot
ba86da86c1 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: I642535fe4ad349182e1508a5e6e6d855f2c14dd9
2021-05-24 16:37:08 +00:00
TreeHugger Robot
ecfd6714d9 Merge "Fix footer issues" into sc-dev am: 7ca749e3a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14633558

Change-Id: I6dafe7597559f8b9fe9b5cfbfe21a02f7ee09d95
2021-05-24 16:35:05 +00:00
TreeHugger Robot
7ca749e3a5 Merge "Fix footer issues" into sc-dev 2021-05-24 16:15:36 +00:00
jasonwshsu
ea6bb2dc4a Fix transparency seekbar in accessibility button page is backwards
Root Cause: Store value in opacity value, need to be inverted to
transparency value.

Solution: transfer to transparency value and rename related field.

Bug: 183980065
Test: atest FloatingMenuTransparencyPreferenceControllerTest
Change-Id: I763dda47854e7cf945a95f4a7d4965725cd73824
2021-05-24 21:46:40 +08:00
Julia Reynolds
05f20f44f2 Improve entrance animations on convo page
By moving loading in each controller to the same thread.
There will still be shifting as the conversation prefs are added, but it
won't be the over thte top shift up and shift down motion that existed
prior to this cl.

Test: manual
Fixes: 188734400
Change-Id: I202981b603b8f9308b2b352a0939182910869cd6
2021-05-24 09:02:24 -04:00
YUKAI HUNG
c85f67085a Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c am: 227e400803
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682957

Change-Id: I60f01e10b4af35341c135df480129e0140d64cc7
2021-05-24 12:10:02 +00:00
ryanlwlin
027aa82d46 Correct punctuation for inconsistency
Bug: 187216931
Test: manually test
Change-Id: Ibd9c81e84b5f091b6f71e18ad79342979881d8b8
2021-05-24 20:09:04 +08: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
menghanli
c3ce01cdde Apply color extraction for sub settings in SuW
Bug: 183713013
Test: Run initBCTestEnv_S.sh and apply different color
Change-Id: Ia06983a8bcfa9cbf190d0c73496b5d70660ffa4e
2021-05-24 11:56:31 +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
227e400803 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: I6fa69766a4e8d7fb0332da7ba657a71207c24443
2021-05-24 11:52:33 +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
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
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