Merge "Fix broken launcher build to use the right import for ContextThemeWrapper." into sc-v2-dev am: 93be1fb110

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15419006

Change-Id: Ia2d43526e2d8e41f569f4b40a13eed51e8750f12
This commit is contained in:
TreeHugger Robot
2021-07-30 18:44:33 +00:00
committed by Automerger Merge Worker

View File

@@ -32,6 +32,7 @@ import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.SurfaceControl;
@@ -44,7 +45,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.view.ContextThemeWrapper;
import com.android.internal.annotations.VisibleForTesting;
import com.android.wm.shell.R;