Commit 203a8b36 authored by Alex Newcomer's avatar Alex Newcomer Committed by Dale Curtis

Reland "CrOS Shelf: add background over app list"

The original CL was reverted because of a test failure that was since
then fixed in CL 1194509

This is a reland of 468ce86a

Original change's description:
> CrOS Shelf: add background over app list
>
> Currently the shelf is fully transparent when the app
> list is open. In thr new UI, we want to make it slightly
> darker to distinguish it from the app list.
>
> Bug: 878601
> Change-Id: I5167e684e174c2d48334f45fa9b1c66e79ba32b7
> Reviewed-on: https://chromium-review.googlesource.com/1194067
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Commit-Queue: Manu Cornet <manucornet@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#587137}

TBR=xiyuan@chromium.org
No-Presubmit: true
No-Tree-Checks: true
No-Try: true

Bug: 878601
Change-Id: Ife5ed29f3c325de1665181cac2eb5fe1b39971fc
Reviewed-on: https://chromium-review.googlesource.com/1196144
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarAlex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587358}
parent a50a4194
...@@ -84,7 +84,11 @@ std::pair<int, int> GetTargetColorAlphaValues( ...@@ -84,7 +84,11 @@ std::pair<int, int> GetTargetColorAlphaValues(
target_item_color_alpha = SK_AlphaTRANSPARENT; target_item_color_alpha = SK_AlphaTRANSPARENT;
break; break;
case SHELF_BACKGROUND_APP_LIST: case SHELF_BACKGROUND_APP_LIST:
target_shelf_color_alpha = SK_AlphaTRANSPARENT; if (chromeos::switches::ShouldUseShelfNewUi()) {
target_shelf_color_alpha = kShelfTranslucentOverAppList;
} else {
target_shelf_color_alpha = SK_AlphaTRANSPARENT;
}
target_item_color_alpha = SK_AlphaTRANSPARENT; target_item_color_alpha = SK_AlphaTRANSPARENT;
break; break;
case SHELF_BACKGROUND_SPLIT_VIEW: case SHELF_BACKGROUND_SPLIT_VIEW:
......
...@@ -65,6 +65,7 @@ constexpr float kShelfInkDropVisibleOpacity = 0.2f; ...@@ -65,6 +65,7 @@ constexpr float kShelfInkDropVisibleOpacity = 0.2f;
ASH_EXPORT constexpr SkColor kShelfIconColor = SK_ColorWHITE; ASH_EXPORT constexpr SkColor kShelfIconColor = SK_ColorWHITE;
// The alpha value for the shelf background. // The alpha value for the shelf background.
ASH_EXPORT constexpr int kShelfTranslucentOverAppList = 77; // 30%
ASH_EXPORT constexpr int kShelfTranslucentAlpha = 153; // 60% ASH_EXPORT constexpr int kShelfTranslucentAlpha = 153; // 60%
ASH_EXPORT constexpr int kShelfTranslucentMaximizedWindowNewUi = 230; // 90% ASH_EXPORT constexpr int kShelfTranslucentMaximizedWindowNewUi = 230; // 90%
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment