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

Commit e9819e6d authored by Jun Mukai's avatar Jun Mukai
Browse files

Add null-check for workspace/hotseat. 

I assumed that they are non-null, but reportedly it was wrong.
This method can be invoked before the views are fully initialized.
Also hotseat can be null as far as I see setupViews(), therefore
null-check and 'importance stored' flag check should be done
separately.

Bug: 21779078
Change-Id: I3f17226f887c38adf2b1fb7ee2a016e00ffc0eb4
parent 49198279

src/com/android/launcher3/Launcher.java

+24 −12
Original line number Diff line number Diff line
@@ -554,32 +554,44 @@ public class Launcher extends Activity 
    public boolean setLauncherCallbacks(LauncherCallbacks callbacks) {

        mLauncherCallbacks = callbacks;

        mLauncherCallbacks.setLauncherSearchCallback(new Launcher.LauncherSearchCallbacks() {

            private boolean mImportanceStored = false;

            private boolean mWorkspaceImportanceStored = false;

            private boolean mHotseatImportanceStored = false;

            private int mWorkspaceImportanceForAccessibility =

                View.IMPORTANT_FOR_ACCESSIBILITY_AUTO;

            private int mHotseatImportanceForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_AUTO;



            @Override

            public void onSearchOverlayOpened() {

                if (mImportanceStored) {

                if (mWorkspaceImportanceStored || mHotseatImportanceStored) {

                    return;

                }

                // The underlying workspace and hotseat are temporarily suppressed by the search

                // overlay. So they sholudn't be accessible.

                mWorkspaceImportanceForAccessibility = mWorkspace.getImportantForAccessibility();

                mHotseatImportanceForAccessibility = mHotseat.getImportantForAccessibility();

                if (mWorkspace != null) {

                    mWorkspaceImportanceForAccessibility =

                            mWorkspace.getImportantForAccessibility();

                    mWorkspace.setImportantForAccessibility(

                            View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

                    mWorkspaceImportanceStored = true;

                }

                if (mHotseat != null) {

                    mHotseatImportanceForAccessibility = mHotseat.getImportantForAccessibility();

                    mHotseat.setImportantForAccessibility(

                            View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

                mImportanceStored = true;

                    mHotseatImportanceStored = true;

                }

            }



            @Override

            public void onSearchOverlayClosed() {

                if (mWorkspaceImportanceStored && mWorkspace != null) {

                    mWorkspace.setImportantForAccessibility(mWorkspaceImportanceForAccessibility);

                }

                if (mHotseatImportanceStored && mHotseat != null) {

                    mHotseat.setImportantForAccessibility(mHotseatImportanceForAccessibility);

                mImportanceStored = false;

                }

                mWorkspaceImportanceStored = false;

                mHotseatImportanceStored = false;

            }

        });

        return true;