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

Commit fdd6b8b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix broken launcher build to use the right import for... 

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

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

Change-Id: Ia2d43526e2d8e41f569f4b40a13eed51e8750f12
parents d84ec1ba 93be1fb1

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTutorialHandler.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.res.ColorStateList; 
import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.Rect;

import android.view.ContextThemeWrapper;

import android.view.Gravity;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.SurfaceControl;

import android.view.SurfaceControl;
@@ -44,7 +45,6 @@ import android.widget.ImageView; 
import android.widget.TextView;

import android.widget.TextView;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.appcompat.view.ContextThemeWrapper;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.wm.shell.R;

import com.android.wm.shell.R;