Commit 5d79548a authored by Matthew Mourgos's avatar Matthew Mourgos Committed by Commit Bot

cros: Pagination buttons no longer change pages while folder is open.

Bug: 883163
Change-Id: I49b5c18601bb53f3f199aff9363d84a0ae1f7dc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1644597Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Matthew Mourgos <mmourgos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667247}
parent 88a5e22f
...@@ -450,6 +450,7 @@ void AppsContainerView::SetShowState(ShowState show_state, ...@@ -450,6 +450,7 @@ void AppsContainerView::SetShowState(ShowState show_state,
switch (show_state_) { switch (show_state_) {
case SHOW_APPS: case SHOW_APPS:
page_switcher_->set_can_process_events_within_subtree(true);
folder_background_view_->SetVisible(false); folder_background_view_->SetVisible(false);
apps_grid_view_->ResetForShowApps(); apps_grid_view_->ResetForShowApps();
if (show_apps_with_animation) if (show_apps_with_animation)
...@@ -458,10 +459,12 @@ void AppsContainerView::SetShowState(ShowState show_state, ...@@ -458,10 +459,12 @@ void AppsContainerView::SetShowState(ShowState show_state,
app_list_folder_view_->HideViewImmediately(); app_list_folder_view_->HideViewImmediately();
break; break;
case SHOW_ACTIVE_FOLDER: case SHOW_ACTIVE_FOLDER:
page_switcher_->set_can_process_events_within_subtree(false);
folder_background_view_->SetVisible(true); folder_background_view_->SetVisible(true);
app_list_folder_view_->ScheduleShowHideAnimation(true, false); app_list_folder_view_->ScheduleShowHideAnimation(true, false);
break; break;
case SHOW_ITEM_REPARENT: case SHOW_ITEM_REPARENT:
page_switcher_->set_can_process_events_within_subtree(true);
folder_background_view_->SetVisible(false); folder_background_view_->SetVisible(false);
app_list_folder_view_->ScheduleShowHideAnimation(false, true); app_list_folder_view_->ScheduleShowHideAnimation(false, true);
break; break;
......
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