Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d64da32 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "setVisibility should not propagate focus on children views" into ub-launcher3-master

parents ddf35928 63dd081b

src/com/android/launcher3/LauncherStateManager.java

+0 −2
Original line number Diff line number Diff line
@@ -420,8 +420,6 @@ public class LauncherStateManager { 
        }



        UiFactory.onLauncherStateOrResumeChanged(mLauncher);



        mLauncher.getDragLayer().requestFocus();

    }



    public void onWindowFocusChanged() {

src/com/android/launcher3/anim/AlphaUpdateListener.java

+10 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.Animator; 
import android.animation.ValueAnimator;

import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.view.View;

import android.view.ViewGroup;



/**

 * A convenience class to update a view's visibility state after an alpha animation.
@@ -55,7 +56,15 @@ public class AlphaUpdateListener extends AnimationSuccessListener 
            view.setVisibility(View.INVISIBLE);

        } else if (view.getAlpha() > ALPHA_CUTOFF_THRESHOLD

                && view.getVisibility() != View.VISIBLE) {

            if (view instanceof ViewGroup) {

                ViewGroup viewGroup = ((ViewGroup) view);

                int oldFocusability = viewGroup.getDescendantFocusability();

                viewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);

                viewGroup.setVisibility(View.VISIBLE);

                viewGroup.setDescendantFocusability(oldFocusability);

            } else {

                view.setVisibility(View.VISIBLE);

            }

        }

    }

}
 
 No newline at end of file