Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert back configs #3802

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Revert back configs #3802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
import androidx.annotation.BinderThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
//import com.android.app.viewcapture.SettingsAwareViewCapture;
import com.android.app.viewcapture.SettingsAwareViewCapture;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
Expand Down Expand Up @@ -532,7 +532,7 @@ protected void onCreate(Bundle savedInstanceState) {
addMultiWindowModeChangedListener(mDepthController);
initUnfoldTransitionProgressProvider();
if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
// mViewCapture = SettingsAwareViewCapture.getInstance(this).startCapture(getWindow());
mViewCapture = SettingsAwareViewCapture.getInstance(this).startCapture(getWindow());
}
getWindow().addPrivateFlags(PRIVATE_FLAG_OPTIMIZE_MEASURE);
}
Expand Down
8 changes: 4 additions & 4 deletions quickstep/src/com/android/quickstep/TouchInteractionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;

//import com.android.app.viewcapture.SettingsAwareViewCapture;
import com.android.app.viewcapture.SettingsAwareViewCapture;
import com.android.launcher3.BaseDraggingActivity;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.R;
Expand Down Expand Up @@ -1229,9 +1229,9 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] rawArgs) {
}
mTaskbarManager.dumpLogs("", pw);

// if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
// SettingsAwareViewCapture.getInstance(this).dump(pw, fd, this);
// }
if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
SettingsAwareViewCapture.getInstance(this).dump(pw, fd, this);
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/com/android/launcher3/config/FeatureFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static boolean topQsbOnFirstScreenEnabled(Context context) {

public static final BooleanFlag ENABLE_GESTURE_ERROR_DETECTION = getDebugFlag(270389990,
"ENABLE_GESTURE_ERROR_DETECTION",
true,
false,
"Analyze gesture events and log detected errors");

// When enabled the promise icon is visible in all apps while installation an
Expand Down Expand Up @@ -160,12 +160,12 @@ public static boolean topQsbOnFirstScreenEnabled(Context context) {

public static final BooleanFlag ENABLE_BULK_WORKSPACE_ICON_LOADING = getDebugFlag(270392203,
"ENABLE_BULK_WORKSPACE_ICON_LOADING",
true,
false,
"Enable loading workspace icons in bulk.");

public static final BooleanFlag ENABLE_BULK_ALL_APPS_ICON_LOADING = getDebugFlag(270392465,
"ENABLE_BULK_ALL_APPS_ICON_LOADING",
true,
false,
"Enable loading all apps icons in bulk.");

public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(270392706,
Expand Down