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

Commit 15a7bc62 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Removing unused imports and swiching off deprecated APIs"

parents 629c6765 aa47a6b3

core/java/android/widget/ActivityChooserView.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -33,8 +33,6 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewGroup;

import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver.OnGlobalLayoutListener;

import android.view.ViewTreeObserver.OnGlobalLayoutListener;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;

import android.widget.ActivityChooserModel.ActivityChooserModelClient;

import android.widget.ActivityChooserModel.ActivityChooserModelClient;





/**

/**
@@ -366,7 +364,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 
            getListPopupWindow().dismiss();

            getListPopupWindow().dismiss();

            ViewTreeObserver viewTreeObserver = getViewTreeObserver();

            ViewTreeObserver viewTreeObserver = getViewTreeObserver();

            if (viewTreeObserver.isAlive()) {

            if (viewTreeObserver.isAlive()) {

                viewTreeObserver.removeGlobalOnLayoutListener(mOnGlobalLayoutListener);

                viewTreeObserver.removeOnGlobalLayoutListener(mOnGlobalLayoutListener);

            }

            }

        }

        }

        return true;

        return true;
@@ -400,7 +398,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 
        }

        }

        ViewTreeObserver viewTreeObserver = getViewTreeObserver();

        ViewTreeObserver viewTreeObserver = getViewTreeObserver();

        if (viewTreeObserver.isAlive()) {

        if (viewTreeObserver.isAlive()) {

            viewTreeObserver.removeGlobalOnLayoutListener(mOnGlobalLayoutListener);

            viewTreeObserver.removeOnGlobalLayoutListener(mOnGlobalLayoutListener);

        }

        }

        mIsAttachedToWindow = false;

        mIsAttachedToWindow = false;

    }

    }