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

Commit 60fcc50d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing resource package name"

parents 0eae0b2a 33df26a1

packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java

+1 −1
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ import android.media.session.PlaybackState; 
import android.os.UserHandle;



import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.statusbar.policy.UserInfoController;

import com.android.wm.shell.R;



import java.util.ArrayList;

import java.util.Collections;

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import androidx.dynamicanimation.animation.SpringForce; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.logging.MetricsLoggerWrapper;

import com.android.systemui.R;

import com.android.systemui.model.SysUiState;

import com.android.systemui.pip.PipAnimationController;

import com.android.systemui.pip.PipBoundsHandler;
@@ -67,7 +68,6 @@ import com.android.systemui.util.DismissCircleView; 
import com.android.systemui.util.FloatingContentCoordinator;

import com.android.systemui.util.animation.PhysicsAnimator;

import com.android.systemui.util.magnetictarget.MagnetizedObject;

import com.android.wm.shell.R;



import java.io.PrintWriter;

packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.util.Log; 
import android.view.DisplayInfo;



import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.UiOffloadThread;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.pip.BasePipManager;
@@ -57,7 +58,6 @@ import com.android.systemui.shared.system.PinnedStackListenerForwarder.PinnedSta 
import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.WindowManagerWrapper;

import com.android.systemui.stackdivider.Divider;

import com.android.wm.shell.R;



import java.util.ArrayList;

import java.util.List;