Simplify HomeCardGestureManager::UpdateScrollState()

athena/home/home_card_impl.cc

Index: athena/home/home_card_impl.cc
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
index 0066cf3d3be8e000d6fe2972df30c5e20fa8b190..80b96b1d0b2d9f10fcb0330250421af0f664e7ed 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -157,10 +157,8 @@ class HomeCardView : public views::WidgetDelegateView {
                         HomeCard::State to_state,
                         float progress) {
     // TODO(mukai): not clear the focus, but simply close the virtual keyboard.
-    if (from_state != HomeCard::VISIBLE_CENTERED ||
-        to_state != HomeCard::VISIBLE_CENTERED) {
-      GetFocusManager()->ClearFocus();
-    }
+    GetFocusManager()->ClearFocus();

[Jun Mukai, 2014/09/02 03:51:42]

Not sure why how this change is related to the bug.

[pkotwicz, 2014/09/02 04:41:32]

This change is related to this CL given that if |from_state| is never equal to
|to_state|, then the if statement can be removed.

[Jun Mukai, 2014/09/02 08:22:42]

Hmm, that sounds a bug then.
In case the user drag up from CENTERED state, I think that's not a trigger to
close the virtual keyboard by itself. When the user drag *down*, on the other
hand, the virtual keyboard should be closed though.

So, I think we should not remove this condition but modify
home_card_gesture_manager.cc to achieve both |from_state| and |to_state| to be
CENTERED in such case.

+
     if (from_state == HomeCard::VISIBLE_CENTERED)
       main_view_->SetLayoutState(1.0f - progress);
     else if (to_state == HomeCard::VISIBLE_CENTERED)
@@ -402,8 +400,9 @@ void HomeCardImpl::OnGestureProgressed(
     State from_state, State to_state, float progress) {
   if (from_state == VISIBLE_MINIMIZED || to_state == VISIBLE_MINIMIZED) {
     minimized_home_->layer()->SetVisible(true);
-    float opacity =
-        (from_state == VISIBLE_MINIMIZED) ? 1.0f - progress : progress;
+    float opacity = 1.0f;
+    if (from_state != to_state)
+      opacity = (from_state == VISIBLE_MINIMIZED) ? 1.0f - progress : progress;

[Jun Mukai, 2014/09/02 03:51:42]

Can you fix home_card_gesture_manager side in this case?  That could be a recent
regression.

[pkotwicz, 2014/09/02 04:41:32]

I have now fixed this in home_card_gesture_manager.cc In particular,
|from_state| is never equal to |to_state| anymore.

It is slightly confusing that we set |from_state| to an arbitrary value if
|from_state| would otherwise be equal to |to_state|. However, it makes code
simpler.

     minimized_home_->layer()->SetOpacity(opacity);
   }
   gfx::Rect screen_bounds =