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

Commit 63dd081b authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

setVisibility should not propagate focus on children views 

Bug: 120064903
Change-Id: I2d58d1ef89db7749f9e6551c716b3cc0567915b3
parent 6478d4f4

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