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

Commit 90ae4553 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Move PhoneWindow and friends back into internal package" into mnc-dev

parents 7afd01e2 6711f3b3

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ import android.view.Menu; 
import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.MotionEvent;

import android.view.PhoneWindow;

import com.android.internal.policy.PhoneWindow;

import android.view.SearchEvent;

import android.view.View;

import android.view.View.OnCreateContextMenuListener;

core/java/android/app/Dialog.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import android.view.LayoutInflater; 
import android.view.Menu;

import android.view.MenuItem;

import android.view.MotionEvent;

import android.view.PhoneWindow;

import com.android.internal.policy.PhoneWindow;

import android.view.SearchEvent;

import android.view.View;

import android.view.View.OnCreateContextMenuListener;

core/java/android/app/SystemServiceRegistry.java

+1 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ import android.os.IPowerManager; 
import android.os.IUserManager;

import android.os.PowerManager;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemVibrator;

import android.os.UserHandle;
@@ -111,7 +110,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.PhoneLayoutInflater;

import com.android.internal.policy.PhoneLayoutInflater;

import android.view.WindowManager;

import android.view.WindowManagerImpl;

import android.view.accessibility.AccessibilityManager;

core/java/android/service/dreams/DreamService.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import android.view.KeyEvent; 
import android.view.Menu;

import android.view.MenuItem;

import android.view.MotionEvent;

import android.view.PhoneWindow;

import com.android.internal.policy.PhoneWindow;

import android.view.SearchEvent;

import android.view.View;

import android.view.ViewGroup;

core/java/android/view/ViewRootImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.widget.Scroller; 


import com.android.internal.R;

import com.android.internal.os.SomeArgs;

import com.android.internal.policy.PhoneFallbackEventHandler;

import com.android.internal.util.ScreenShapeHelper;

import com.android.internal.view.BaseSurfaceHolder;

import com.android.internal.view.RootViewSurfaceTaker;