PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hardcode the className instead of class.getSimpleName()." into main

Browse Source
This commit is contained in:
Anushree Ganjam
2024-05-09 20:13:13 +00:00
committed by Android (Google) Code Review
parent 5b650d0796 c9eda41c31
commit 798340dc6d
37 changed files with 165 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+1 -1
View File
@@ -286,7 +286,7 @@ public class PredictionRowView<T extends Context & ActivityContext>
}
public void dump(String prefix, PrintWriter writer) {
writer.println(prefix + this.getClass().getSimpleName());
writer.println(prefix + "PredictionRowView");
writer.println(prefix + "\tmPredictionsEnabled: " + mPredictionsEnabled);
writer.println(prefix + "\tmPredictionUiUpdatePaused: " + mPredictionUiUpdatePaused);
writer.println(prefix + "\tmNumPredictedAppsPerRow: " + mNumPredictedAppsPerRow);
quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+1 -1
View File
@@ -521,7 +521,7 @@ public class HotseatPredictionController implements DragController.DragListener,
}
public void dump(String prefix, PrintWriter writer) {
writer.println(prefix + this.getClass().getSimpleName());
writer.println(prefix + "HotseatPredictionController");
writer.println(prefix + "\tFlags: " + getStateString(mPauseFlags));
writer.println(prefix + "\tmHotSeatItemsCount: " + mHotSeatItemsCount);
writer.println(prefix + "\tmPredictedItems: " + mPredictedItems);
quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
/** {@link SystemShortcut.Factory} implementation to create workspace split shortcuts */
public interface QuickstepSystemShortcut {
String TAG = QuickstepSystemShortcut.class.getSimpleName();
String TAG = "QuickstepSystemShortcut";
static SystemShortcut.Factory<QuickstepLauncher> getSplitSelectShortcutByPosition(
SplitPositionOption position) {
quickstep/src/com/android/launcher3/splitscreen/SplitShortcut.kt
+1 -1
View File
@@ -45,7 +45,7 @@ abstract class SplitShortcut<T>(
) : SystemShortcut<T>(iconResId, labelResId, target, itemInfo, originalView) where
T : Context?,
T : ActivityContext? {
private val TAG = SystemShortcut::class.java.simpleName
private val TAG = "SplitShortcut"
// Initiate splitscreen from the Home screen or Home All Apps
protected val splitSelectSource: SplitSelectSource?
quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class DepthController extends BaseDepthController implements StateHandler
}
public void dump(String prefix, PrintWriter writer) {
writer.println(prefix + this.getClass().getSimpleName());
writer.println(prefix + "DepthController");
writer.println(prefix + "\tmMaxBlurRadius=" + mMaxBlurRadius);
writer.println(prefix + "\tmCrossWindowBlursEnabled=" + mCrossWindowBlursEnabled);
writer.println(prefix + "\tmSurface=" + mSurface);
quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java
+5
View File
@@ -133,4 +133,9 @@ public class FallbackTaskbarUIController extends TaskbarUIController {
protected TISBindHelper getTISBindHelper() {
return mRecentsActivity.getTISBindHelper();
}
@Override
protected String getTaskbarUIControllerName() {
return "FallbackTaskbarUIController";
}
}
quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+5
View File
@@ -446,4 +446,9 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
mTaskbarLauncherStateController.dumpLogs(prefix + "\t", pw);
}
@Override
protected String getTaskbarUIControllerName() {
return "LauncherTaskbarUIController";
}
}
quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+1 -1
View File
@@ -65,7 +65,7 @@ import java.util.StringJoiner;
*/
public class TaskbarLauncherStateController {
private static final String TAG = TaskbarLauncherStateController.class.getSimpleName();
private static final String TAG = "TaskbarLauncherStateController";
private static final boolean DEBUG = false;
/** Launcher activity is visible and focused. */
quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
/** Allow some time in between the long press for back and recents. */
static final int SCREEN_PIN_LONG_PRESS_THRESHOLD = 200;
static final int SCREEN_PIN_LONG_PRESS_RESET = SCREEN_PIN_LONG_PRESS_THRESHOLD + 100;
private static final String TAG = TaskbarNavButtonController.class.getSimpleName();
private static final String TAG = "TaskbarNavButtonController";
private long mLastScreenPinLongPress;
private boolean mScreenPinned;
quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
+1 -1
View File
@@ -78,7 +78,7 @@ import java.util.function.IntPredicate;
* create a cohesive animation between stashed/unstashed states.
*/
public class TaskbarStashController implements TaskbarControllers.LoggableTaskbarController {
private static final String TAG = TaskbarStashController.class.getSimpleName();
private static final String TAG = "TaskbarStashController";
private static final boolean DEBUG = false;
public static final int FLAG_IN_APP = 1 << 0;
quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
+5 -2
View File
@@ -55,7 +55,6 @@ import java.util.stream.Stream;
* Base class for providing different taskbar UI
*/
public class TaskbarUIController {
public static final TaskbarUIController DEFAULT = new TaskbarUIController();
// Initialized in init.
@@ -91,6 +90,10 @@ public class TaskbarUIController {
*/
protected void onIconLayoutBoundsChanged() { }
protected String getTaskbarUIControllerName() {
return "TaskbarUIController";
}
/** Called when an icon is launched. */
@CallSuper
public void onTaskbarIconLaunched(ItemInfo item) {
@@ -207,7 +210,7 @@ public class TaskbarUIController {
pw.println(String.format(
"%sTaskbarUIController: using an instance of %s",
prefix,
getClass().getSimpleName()));
getTaskbarUIControllerName()));
}
/**
quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+1 -1
View File
@@ -71,7 +71,7 @@ import java.util.function.Predicate;
*/
public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconParent, Insettable,
DeviceProfile.OnDeviceProfileChangeListener {
private static final String TAG = TaskbarView.class.getSimpleName();
private static final String TAG = "TaskbarView";
private static final Rect sTmpRect = new Rect();
quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+1 -1
View File
@@ -79,7 +79,7 @@ import java.util.function.Predicate;
*/
public class TaskbarViewController implements TaskbarControllers.LoggableTaskbarController {
private static final String TAG = TaskbarViewController.class.getSimpleName();
private static final String TAG = "TaskbarViewController";
private static final Runnable NO_OP = () -> { };
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
+1 -1
View File
@@ -94,7 +94,7 @@ import java.util.concurrent.Executors;
*/
public class BubbleBarController extends IBubblesListener.Stub {
private static final String TAG = BubbleBarController.class.getSimpleName();
private static final String TAG = "BubbleBarController";
private static final boolean DEBUG = false;
/**
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java
+1 -1
View File
@@ -76,7 +76,7 @@ import java.util.function.Consumer;
*/
public class BubbleBarView extends FrameLayout {
private static final String TAG = BubbleBarView.class.getSimpleName();
private static final String TAG = "BubbleBarView";
// TODO: (b/273594744) calculate the amount of space we have and base the max on that
// if it's smaller than 5.
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
+1 -1
View File
@@ -55,7 +55,7 @@ import java.util.function.Consumer;
*/
public class BubbleBarViewController {
private static final String TAG = BubbleBarViewController.class.getSimpleName();
private static final String TAG = "BubbleBarViewController";
private static final float APP_ICON_SMALL_DP = 44f;
private static final float APP_ICON_MEDIUM_DP = 48f;
private static final float APP_ICON_LARGE_DP = 52f;
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissController.java
+1 -1
View File
@@ -40,7 +40,7 @@ import com.android.wm.shell.common.magnetictarget.MagnetizedObject;
* @see BubbleDragController
*/
public class BubbleDismissController {
private static final String TAG = BubbleDismissController.class.getSimpleName();
private static final String TAG = "BubbleDismissController";
private static final float FLING_TO_DISMISS_MIN_VELOCITY = 6000f;
private final TaskbarActivityContext mActivity;
private final TaskbarDragLayer mDragLayer;
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java
+1 -1
View File
@@ -42,7 +42,7 @@ import com.android.wm.shell.shared.animation.PhysicsAnimator;
*/
public class BubbleStashController {
private static final String TAG = BubbleStashController.class.getSimpleName();
private static final String TAG = "BubbleStashController";
/**
* How long to stash/unstash.
quickstep/src/com/android/quickstep/SystemUiProxy.java
+1 -1
View File
@@ -111,7 +111,7 @@ import java.util.List;
* Holds the reference to SystemUI.
*/
public class SystemUiProxy implements ISystemUiProxy, NavHandle, SafeCloseable {
private static final String TAG = SystemUiProxy.class.getSimpleName();
private static final String TAG = "SystemUiProxy";
public static final MainThreadInitializedObject<SystemUiProxy> INSTANCE =
new MainThreadInitializedObject<>(SystemUiProxy::new);
quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
+108 -86
View File
@@ -38,36 +38,40 @@ import com.android.quickstep.util.SplitSelectDataHolder.Companion.SplitLaunchTyp
import java.io.PrintWriter
/**
* Holds/transforms/signs/seals/delivers information for the transient state of the user
* selecting a first app to start split with and then choosing a second app.
* This class DOES NOT associate itself with drag-and-drop split screen starts because they come
* from the bad part of town.
* Holds/transforms/signs/seals/delivers information for the transient state of the user selecting a
* first app to start split with and then choosing a second app. This class DOES NOT associate
* itself with drag-and-drop split screen starts because they come from the bad part of town.
*
* After setting the correct fields for initial/second.* variables, this converts them into the
* correct [PendingIntent] and [ShortcutInfo] objects where applicable and sends the necessary
* data back via [getSplitLaunchData]. Note: there should be only one "initial" field and one
* "second" field set, with the rest remaining null. (Exception: [Intent] and [UserHandle] are
* always passed in together as a set, and are converted to a single [PendingIntent] or
* correct [PendingIntent] and [ShortcutInfo] objects where applicable and sends the necessary data
* back via [getSplitLaunchData]. Note: there should be only one "initial" field and one "second"
* field set, with the rest remaining null. (Exception: [Intent] and [UserHandle] are always passed
* in together as a set, and are converted to a single [PendingIntent] or
* [ShortcutInfo]+[PendingIntent] before launch.)
*
* [SplitLaunchType] indicates the type of tasks/apps/intents being launched given the provided
* state
*/
class SplitSelectDataHolder(
var context: Context?
) {
class SplitSelectDataHolder(var context: Context?) {
val TAG = SplitSelectDataHolder::class.simpleName
/**
* Order of the constant indicates the order of which task/app was selected.
* Ex. SPLIT_TASK_SHORTCUT means primary split app identified by task, secondary is shortcut
* Order of the constant indicates the order of which task/app was selected. Ex.
* SPLIT_TASK_SHORTCUT means primary split app identified by task, secondary is shortcut
* SPLIT_SHORTCUT_TASK means primary split app is determined by shortcut, secondary is task
*/
companion object {
@IntDef(SPLIT_TASK_TASK, SPLIT_TASK_PENDINGINTENT, SPLIT_TASK_SHORTCUT,
SPLIT_PENDINGINTENT_TASK, SPLIT_PENDINGINTENT_PENDINGINTENT, SPLIT_SHORTCUT_TASK,
SPLIT_SINGLE_TASK_FULLSCREEN, SPLIT_SINGLE_INTENT_FULLSCREEN,
SPLIT_SINGLE_SHORTCUT_FULLSCREEN)
@IntDef(
SPLIT_TASK_TASK,
SPLIT_TASK_PENDINGINTENT,
SPLIT_TASK_SHORTCUT,
SPLIT_PENDINGINTENT_TASK,
SPLIT_PENDINGINTENT_PENDINGINTENT,
SPLIT_SHORTCUT_TASK,
SPLIT_SINGLE_TASK_FULLSCREEN,
SPLIT_SINGLE_INTENT_FULLSCREEN,
SPLIT_SINGLE_SHORTCUT_FULLSCREEN
)
@Retention(AnnotationRetention.SOURCE)
annotation class SplitLaunchType
@@ -84,8 +88,7 @@ class SplitSelectDataHolder(
const val SPLIT_SINGLE_SHORTCUT_FULLSCREEN = 8
}
@StagePosition
private var initialStagePosition: Int = STAGE_POSITION_UNDEFINED
@StagePosition private var initialStagePosition: Int = STAGE_POSITION_UNDEFINED
private var itemInfo: ItemInfo? = null
private var secondItemInfo: ItemInfo? = null
private var splitEvent: EventEnum? = null
@@ -108,12 +111,16 @@ class SplitSelectDataHolder(
/**
* @param alreadyRunningTask if set to [android.app.ActivityTaskManager.INVALID_TASK_ID]
* then @param intent will be used to launch the initial task
* then @param intent will be used to launch the initial task
* @param intent will be ignored if @param alreadyRunningTask is set
*/
fun setInitialTaskSelect(intent: Intent?, @StagePosition stagePosition: Int,
itemInfo: ItemInfo?, splitEvent: EventEnum?,
alreadyRunningTask: Int) {
fun setInitialTaskSelect(
intent: Intent?,
@StagePosition stagePosition: Int,
itemInfo: ItemInfo?,
splitEvent: EventEnum?,
alreadyRunningTask: Int
) {
if (alreadyRunningTask != INVALID_TASK_ID) {
initialTaskId = alreadyRunningTask
} else {
@@ -127,15 +134,21 @@ class SplitSelectDataHolder(
* To be called after first task selected from using a split shortcut from the fullscreen
* running app.
*/
fun setInitialTaskSelect(info: RunningTaskInfo,
@StagePosition stagePosition: Int, itemInfo: ItemInfo?,
splitEvent: EventEnum?) {
fun setInitialTaskSelect(
info: RunningTaskInfo,
@StagePosition stagePosition: Int,
itemInfo: ItemInfo?,
splitEvent: EventEnum?
) {
initialTaskId = info.taskId
setInitialData(stagePosition, splitEvent, itemInfo)
}
private fun setInitialData(@StagePosition stagePosition: Int,
event: EventEnum?, item: ItemInfo?) {
private fun setInitialData(
@StagePosition stagePosition: Int,
event: EventEnum?,
item: ItemInfo?
) {
itemInfo = item
initialStagePosition = stagePosition
splitEvent = event
@@ -143,6 +156,7 @@ class SplitSelectDataHolder(
/**
* To be called as soon as user selects the second task (even if animations aren't complete)
*
* @param taskId The second task that will be launched.
*/
fun setSecondTask(taskId: Int, itemInfo: ItemInfo) {
@@ -152,6 +166,7 @@ class SplitSelectDataHolder(
/**
* To be called as soon as user selects the second app (even if animations aren't complete)
*
* @param intent The second intent that will be launched.
* @param user The user of that intent.
*/
@@ -162,8 +177,9 @@ class SplitSelectDataHolder(
}
/**
* To be called as soon as user selects the second app (even if animations aren't complete)
* Sets [secondUser] from that of the pendingIntent
* To be called as soon as user selects the second app (even if animations aren't complete) Sets
* [secondUser] from that of the pendingIntent
*
* @param pendingIntent The second PendingIntent that will be launched.
*/
fun setSecondTask(pendingIntent: PendingIntent, itemInfo: ItemInfo) {
@@ -173,9 +189,9 @@ class SplitSelectDataHolder(
}
/**
* Similar to [setSecondTask] except this is to be called for widgets which can pass through
* an extra intent from their RemoteResponse.
* See [android.widget.RemoteViews.RemoteResponse.getLaunchOptions].first
* Similar to [setSecondTask] except this is to be called for widgets which can pass through an
* extra intent from their RemoteResponse. See
* [android.widget.RemoteViews.RemoteResponse.getLaunchOptions].first
*/
fun setSecondWidget(pendingIntent: PendingIntent, widgetIntent: Intent?, itemInfo: ItemInfo) {
setSecondTask(pendingIntent, itemInfo)
@@ -184,8 +200,7 @@ class SplitSelectDataHolder(
private fun getShortcutInfo(intent: Intent?, user: UserHandle?): ShortcutInfo? {
val intentPackage = intent?.getPackage() ?: return null
val shortcutId = intent.getStringExtra(ShortcutKey.EXTRA_SHORTCUT_ID)
?: return null
val shortcutId = intent.getStringExtra(ShortcutKey.EXTRA_SHORTCUT_ID) ?: return null
try {
val context: Context =
if (user != null) {
@@ -200,9 +215,7 @@ class SplitSelectDataHolder(
return null
}
/**
* Converts intents to pendingIntents, associating the [user] with the intent if provided
*/
/** Converts intents to pendingIntents, associating the [user] with the intent if provided */
private fun getPendingIntent(intent: Intent?, user: UserHandle?): PendingIntent? {
if (intent != initialIntent && intent != secondIntent) {
throw IllegalStateException("Invalid intent to convert to PendingIntent")
@@ -211,12 +224,21 @@ class SplitSelectDataHolder(
return if (intent == null) {
null
} else if (user != null) {
PendingIntent.getActivityAsUser(context, 0, intent,
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT,
null /* options */, user)
PendingIntent.getActivityAsUser(
context,
0,
intent,
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT,
null /* options */,
user
)
} else {
PendingIntent.getActivity(context, 0, intent,
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT)
PendingIntent.getActivity(
context,
0,
intent,
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT
)
}
}
@@ -224,7 +246,7 @@ class SplitSelectDataHolder(
* @return [SplitLaunchData] with the necessary fields populated as determined by
* [SplitLaunchData.splitLaunchType]. This is to be used for launching splitscreen
*/
fun getSplitLaunchData() : SplitLaunchData {
fun getSplitLaunchData(): SplitLaunchData {
// Convert all intents to shortcut infos to see if determine if we launch shortcut or intent
convertIntentsToFinalTypes()
val splitLaunchType = getSplitLaunchType()
@@ -241,7 +263,7 @@ class SplitSelectDataHolder(
* [SplitLaunchData.splitLaunchType]. This is to be used for launching an initially selected
* split task in fullscreen
*/
fun getFullscreenLaunchData() : SplitLaunchData {
fun getFullscreenLaunchData(): SplitLaunchData {
// Convert all intents to shortcut infos to determine if we launch shortcut or intent
convertIntentsToFinalTypes()
val splitLaunchType = getFullscreenLaunchType()
@@ -249,21 +271,22 @@ class SplitSelectDataHolder(
return generateSplitLaunchData(splitLaunchType)
}
private fun generateSplitLaunchData(@SplitLaunchType splitLaunchType: Int) : SplitLaunchData {
private fun generateSplitLaunchData(@SplitLaunchType splitLaunchType: Int): SplitLaunchData {
return SplitLaunchData(
splitLaunchType,
initialTaskId,
secondTaskId,
initialPendingIntent,
secondPendingIntent,
widgetSecondIntent,
initialUser?.identifier ?: -1,
secondUser?.identifier ?: -1,
initialShortcut,
secondShortcut,
itemInfo,
splitEvent,
initialStagePosition)
splitLaunchType,
initialTaskId,
secondTaskId,
initialPendingIntent,
secondPendingIntent,
widgetSecondIntent,
initialUser?.identifier ?: -1,
secondUser?.identifier ?: -1,
initialShortcut,
secondShortcut,
itemInfo,
splitEvent,
initialStagePosition
)
}
/**
@@ -273,8 +296,7 @@ class SplitSelectDataHolder(
* Note that both [initialIntent] and [secondIntent] will be nullified on method return
*
* One caveat is that if [secondPendingIntent] is set, we will use that and *not* attempt to
* convert [secondIntent].
* This also leaves [widgetSecondIntent] untouched.
* convert [secondIntent]. This also leaves [widgetSecondIntent] untouched.
*/
private fun convertIntentsToFinalTypes() {
initialShortcut = getShortcutInfo(initialIntent, initialUser)
@@ -297,8 +319,8 @@ class SplitSelectDataHolder(
}
/**
* Only valid data fields at this point should be tasks, shortcuts, or pendingIntents
* Intents need to be converted in [convertIntentsToFinalTypes] prior to calling this method
* Only valid data fields at this point should be tasks, shortcuts, or pendingIntents Intents
* need to be converted in [convertIntentsToFinalTypes] prior to calling this method
*/
@VisibleForTesting
@SplitLaunchType
@@ -354,41 +376,40 @@ class SplitSelectDataHolder(
}
data class SplitLaunchData(
@SplitLaunchType
val splitLaunchType: Int,
var initialTaskId: Int = INVALID_TASK_ID,
var secondTaskId: Int = INVALID_TASK_ID,
var initialPendingIntent: PendingIntent? = null,
var secondPendingIntent: PendingIntent? = null,
var widgetSecondIntent: Intent? = null,
var initialUserId: Int = -1,
var secondUserId: Int = -1,
var initialShortcut: ShortcutInfo? = null,
var secondShortcut: ShortcutInfo? = null,
var itemInfo: ItemInfo? = null,
var splitEvent: EventEnum? = null,
val initialStagePosition: Int = STAGE_POSITION_UNDEFINED
@SplitLaunchType val splitLaunchType: Int,
var initialTaskId: Int = INVALID_TASK_ID,
var secondTaskId: Int = INVALID_TASK_ID,
var initialPendingIntent: PendingIntent? = null,
var secondPendingIntent: PendingIntent? = null,
var widgetSecondIntent: Intent? = null,
var initialUserId: Int = -1,
var secondUserId: Int = -1,
var initialShortcut: ShortcutInfo? = null,
var secondShortcut: ShortcutInfo? = null,
var itemInfo: ItemInfo? = null,
var splitEvent: EventEnum? = null,
val initialStagePosition: Int = STAGE_POSITION_UNDEFINED
)
/**
* @return `true` if first task has been selected and waiting for the second task to be
* chosen
* @return `true` if first task has been selected and waiting for the second task to be chosen
*/
fun isSplitSelectActive(): Boolean {
return isInitialTaskIntentSet() && !isSecondTaskIntentSet()
}
/**
* @return `true` if the first and second task have been chosen and split is waiting to
* be launched
* @return `true` if the first and second task have been chosen and split is waiting to be
* launched
*/
fun isBothSplitAppsConfirmed(): Boolean {
return isInitialTaskIntentSet() && isSecondTaskIntentSet()
}
private fun isInitialTaskIntentSet(): Boolean {
return initialTaskId != INVALID_TASK_ID || initialIntent != null ||
initialPendingIntent != null
return initialTaskId != INVALID_TASK_ID ||
initialIntent != null ||
initialPendingIntent != null
}
fun getInitialTaskId(): Int {
@@ -416,8 +437,9 @@ class SplitSelectDataHolder(
}
private fun isSecondTaskIntentSet(): Boolean {
return secondTaskId != INVALID_TASK_ID || secondIntent != null
|| secondPendingIntent != null
return secondTaskId != INVALID_TASK_ID ||
secondIntent != null ||
secondPendingIntent != null
}
fun resetState() {
@@ -437,7 +459,7 @@ class SplitSelectDataHolder(
}
fun dump(prefix: String, writer: PrintWriter) {
writer.println("$prefix ${javaClass.simpleName}")
writer.println("$prefix SplitSelectDataHolder")
writer.println("$prefix\tinitialStagePosition= $initialStagePosition")
writer.println("$prefix\tinitialTaskId= $initialTaskId")
writer.println("$prefix\tsecondTaskId= $secondTaskId")
quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+1 -1
View File
@@ -46,7 +46,7 @@ import com.android.wm.shell.pip.PipContentOverlay;
* when swiping up (in gesture navigation mode).
*/
public class SwipePipToHomeAnimator extends RectFSpringAnim {
private static final String TAG = SwipePipToHomeAnimator.class.getSimpleName();
private static final String TAG = "SwipePipToHomeAnimator";
private static final float END_PROGRESS = 1.0f;
quickstep/src/com/android/quickstep/util/TaskKeyByLastActiveTimeCache.java
+1 -1
View File
@@ -37,7 +37,7 @@ import java.util.function.Predicate;
* @param <V> Type of object stored in the cache
*/
public class TaskKeyByLastActiveTimeCache<V> implements TaskKeyCache<V> {
private static final String TAG = TaskKeyByLastActiveTimeCache.class.getSimpleName();
private static final String TAG = "TaskKeyByLastActiveTimeCache";
private final AtomicInteger mMaxSize;
private final Map<Integer, Entry<V>> mMap;
// To sort task id by last active time
quickstep/src/com/android/quickstep/views/DesktopTaskView.java
+1 -1
View File
@@ -66,7 +66,7 @@ import java.util.function.Consumer;
// TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks.
public class DesktopTaskView extends TaskView {
private static final String TAG = DesktopTaskView.class.getSimpleName();
private static final String TAG = "DesktopTaskView";
private static final boolean DEBUG = false;
quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+1 -1
View File
@@ -79,7 +79,7 @@ public final class DigitalWellBeingToast {
static final Intent OPEN_APP_USAGE_SETTINGS_TEMPLATE = new Intent(ACTION_APP_USAGE_SETTINGS);
static final int MINUTE_MS = 60000;
private static final String TAG = DigitalWellBeingToast.class.getSimpleName();
private static final String TAG = "DigitalWellBeingToast";
private final RecentsViewContainer mContainer;
private final TaskView mTaskView;
quickstep/src/com/android/quickstep/views/GroupedTaskView.java
+1 -1
View File
@@ -63,7 +63,7 @@ import java.util.function.Consumer;
*/
public class GroupedTaskView extends TaskView {
private static final String TAG = GroupedTaskView.class.getSimpleName();
private static final String TAG = "GroupedTaskView";
// TODO(b/336612373): Support new TTV for GroupedTaskView
private TaskThumbnailViewDeprecated mSnapshotView2;
private TaskViewIcon mIconView2;
quickstep/src/com/android/quickstep/views/TaskView.java
+1 -1
View File
@@ -136,7 +136,7 @@ import java.util.stream.Stream;
*/
public class TaskView extends FrameLayout implements Reusable {
private static final String TAG = TaskView.class.getSimpleName();
private static final String TAG = "TaskView";
public static final int FLAG_UPDATE_ICON = 1;
public static final int FLAG_UPDATE_THUMBNAIL = FLAG_UPDATE_ICON << 1;
public static final int FLAG_UPDATE_CORNER_RADIUS = FLAG_UPDATE_THUMBNAIL << 1;
src/com/android/launcher3/DevicePaddings.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class DevicePaddings {
private static final String WORKSPACE_BOTTOM_PADDING = "workspaceBottomPadding";
private static final String HOTSEAT_BOTTOM_PADDING = "hotseatBottomPadding";
private static final String TAG = DevicePaddings.class.getSimpleName();
private static final String TAG = "DevicePaddings";
private static final boolean DEBUG = false;
ArrayList<DevicePadding> mDevicePaddings = new ArrayList<>();
src/com/android/launcher3/PagedView.java
+1 -1
View File
@@ -788,7 +788,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
if (mScroller.isFinished() && pageScrollChanged) {
// TODO(b/246283207): Remove logging once root cause of flake detected.
if (Utilities.isRunningInTestHarness() && !(this instanceof Workspace)) {
Log.d("b/246283207", this.getClass().getSimpleName() + "#onLayout() -> "
Log.d("b/246283207", TAG + "#onLayout() -> "
+ "if(mScroller.isFinished() && pageScrollChanged) -> getNextPage(): "
+ getNextPage() + ", getScrollForPage(getNextPage()): "
+ getScrollForPage(getNextPage()));
src/com/android/launcher3/model/data/ItemInfo.java
+2 -1
View File
@@ -73,6 +73,7 @@ import java.util.Optional;
* Represents an item in the launcher.
*/
public class ItemInfo {
private static final String TAG = "ItemInfo";
public static final boolean DEBUG = false;
public static final int NO_ID = -1;
@@ -285,7 +286,7 @@ public class ItemInfo {
@Override
@NonNull
public final String toString() {
return getClass().getSimpleName() + "(" + dumpProperties() + ")";
return TAG + "(" + dumpProperties() + ")";
}
@NonNull
src/com/android/launcher3/pm/PackageInstallInfo.java
+2 -1
View File
@@ -22,6 +22,7 @@ import android.os.UserHandle;
import androidx.annotation.NonNull;
public final class PackageInstallInfo {
private static final String TAG = "PackageInstallInfo";
public static final int STATUS_INSTALLED = 0;
public static final int STATUS_INSTALLING = 1;
@@ -61,7 +62,7 @@ public final class PackageInstallInfo {
@Override
public String toString() {
return getClass().getSimpleName() + "(" + dumpProperties() + ")";
return TAG + "(" + dumpProperties() + ")";
}
private String dumpProperties() {
src/com/android/launcher3/responsive/HotseatSpecsProvider.kt
+1 -1
View File
@@ -135,7 +135,7 @@ data class HotseatSpec(
hotseatQsbSpace.fixedSize + edgePadding.fixedSize <= maxAvailableSize
private fun logError(message: String) {
Log.e(LOG_TAG, "${this::class.simpleName}#isValid - $message - $this")
Log.e(LOG_TAG, "$LOG_TAG #isValid - $message - $this")
}
companion object {
src/com/android/launcher3/responsive/ResponsiveCellSpecsProvider.kt
+7 -5
View File
@@ -31,7 +31,7 @@ class ResponsiveCellSpecsProvider(groupOfSpecs: List<ResponsiveSpecGroup<CellSpe
groupOfSpecs
.onEach { group ->
check(group.widthSpecs.isEmpty() && group.heightSpecs.isNotEmpty()) {
"${this::class.simpleName} is invalid, only heightSpecs are allowed - " +
"$LOG_TAG is invalid, only heightSpecs are allowed - " +
"width list size = ${group.widthSpecs.size}; " +
"height list size = ${group.heightSpecs.size}."
}
@@ -65,6 +65,7 @@ class ResponsiveCellSpecsProvider(groupOfSpecs: List<ResponsiveSpecGroup<CellSpe
}
companion object {
private const val LOG_TAG = "ResponsiveCellSpecsProvider"
@JvmStatic
fun create(resourceHelper: ResourceHelper): ResponsiveCellSpecsProvider {
val parser = ResponsiveSpecsParser(resourceHelper)
@@ -137,11 +138,11 @@ data class CellSpec(
}
private fun logError(message: String) {
Log.e(LOG_TAG, "${this::class.simpleName}#isValid - $message - $this")
Log.e(LOG_TAG, "$LOG_TAG#isValid - $message - $this")
}
companion object {
private const val LOG_TAG = "CellSpec"
const val LOG_TAG = "CellSpec"
}
}
@@ -182,6 +183,7 @@ data class CalculatedCellSpec(
)
companion object {
private const val LOG_TAG = "CalculatedCellSpec"
private fun getCalculatedValue(
availableSpace: Int,
spec: SizeSpec,
@@ -191,10 +193,10 @@ data class CalculatedCellSpec(
}
override fun toString(): String {
return "${this::class.simpleName}(" +
return "$LOG_TAG(" +
"availableSpace=$availableSpace, iconSize=$iconSize, " +
"iconTextSize=$iconTextSize, iconDrawablePadding=$iconDrawablePadding, " +
"${spec::class.simpleName}.maxAvailableSize=${spec.maxAvailableSize}" +
"${CellSpec.LOG_TAG}.maxAvailableSize=${spec.maxAvailableSize}" +
")"
}
}
src/com/android/launcher3/responsive/ResponsiveSpec.kt
+1 -1
View File
@@ -154,7 +154,7 @@ data class ResponsiveSpec(
}
private fun logError(message: String) {
Log.e(LOG_TAG, "${this::class.simpleName}#isValid - $message - $this")
Log.e(LOG_TAG, "$LOG_TAG#isValid - $message - $this")
}
enum class DimensionType {
src/com/android/launcher3/responsive/ResponsiveSpecsProvider.kt
+2 -1
View File
@@ -40,7 +40,7 @@ class ResponsiveSpecsProvider(
groupOfSpecs
.onEach { group ->
check(group.widthSpecs.isNotEmpty() && group.heightSpecs.isNotEmpty()) {
"${this::class.simpleName} is incomplete - " +
"$LOG_TAG is incomplete - " +
"width list size = ${group.widthSpecs.size}; " +
"height list size = ${group.heightSpecs.size}."
}
@@ -124,6 +124,7 @@ class ResponsiveSpecsProvider(
}
companion object {
private const val LOG_TAG = "ResponsiveSpecsProvider"
@JvmStatic
fun create(
resourceHelper: ResourceHelper,
src/com/android/launcher3/touch/ItemClickHandler.java
+1 -1
View File
@@ -84,7 +84,7 @@ import java.util.function.Consumer;
*/
public class ItemClickHandler {
private static final String TAG = ItemClickHandler.class.getSimpleName();
private static final String TAG = "ItemClickHandler";
/**
* Instance used for click handling on items
src/com/android/launcher3/views/ArrowTipView.java
+1 -1
View File
@@ -54,7 +54,7 @@ import com.android.launcher3.graphics.TriangleShape;
*/
public class ArrowTipView extends AbstractFloatingView {
private static final String TAG = ArrowTipView.class.getSimpleName();
private static final String TAG = "ArrowTipView";
private static final long AUTO_CLOSE_TIMEOUT_MILLIS = 10 * 1000;
private static final long SHOW_DELAY_MS = 200;
private static final long SHOW_DURATION_MS = 300;
src/com/android/launcher3/views/FloatingIconView.java
+1 -1
View File
@@ -68,7 +68,7 @@ import java.util.function.Supplier;
public class FloatingIconView extends FrameLayout implements
Animator.AnimatorListener, OnGlobalLayoutListener, FloatingView {
private static final String TAG = FloatingIconView.class.getSimpleName();
private static final String TAG = "FloatingIconView";
// Manages loading the icon on a worker thread
private static @Nullable IconLoadResult sIconLoadResult;