0

Enable occlusion tracking on various Activitys

This CL enables occlusion tracking for various Activity types in clank.

Bug: 349735915
Test: CQ
Change-Id: Icd2e3ba6e3e31fa57d7ba691553dc72db1865241
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6024708
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Simeon Anfinrud <sanfin@chromium.org>
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1384168}
This commit is contained in:
Eliot Courtney
2024-11-18 05:33:49 +00:00
committed by Chromium LUCI CQ
parent b6a27c4a00
commit 3ede5b576b
11 changed files with 11 additions and 11 deletions
chrome/android/java/src/org/chromium/chrome/browser
chromecast/browser/android/apk/src/org/chromium/chromecast/shell
components/thin_webview/internal/java/src/org/chromium/components/thinwebview/internal
content/shell/android/shell_apk/src/org/chromium/content_shell_apk

@@ -88,7 +88,7 @@ public class ChromeWindow extends ActivityWindowAndroid {
activityKeyboardVisibilityDelegate, activityKeyboardVisibilityDelegate,
intentRequestTracker, intentRequestTracker,
insetObserver, insetObserver,
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
assert insetObserver != null; assert insetObserver != null;
mCompositorViewHolderSupplier = compositorViewHolderSupplier; mCompositorViewHolderSupplier = compositorViewHolderSupplier;
mModalDialogManagerSupplier = modalDialogManagerSupplier; mModalDialogManagerSupplier = modalDialogManagerSupplier;

@@ -105,7 +105,7 @@ public class CreatorActivity extends SnackbarActivity {
false, false,
intentRequestTracker, intentRequestTracker,
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
TabShareDelegateImpl tabshareDelegate = TabShareDelegateImpl tabshareDelegate =
new TabShareDelegateImpl( new TabShareDelegateImpl(

@@ -66,7 +66,7 @@ public class DeviceLockActivity extends SynchronousInitializationActivity
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
IntentRequestTracker.createFromActivity(this), IntentRequestTracker.createFromActivity(this),
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
mIntentRequestTracker = mWindowAndroid.getIntentRequestTracker(); mIntentRequestTracker = mWindowAndroid.getIntentRequestTracker();
Bundle fragmentArgs = getIntent().getBundleExtra(ARGUMENT_FRAGMENT_ARGS); Bundle fragmentArgs = getIntent().getBundleExtra(ARGUMENT_FRAGMENT_ARGS);

@@ -846,6 +846,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
getIntentRequestTracker(), getIntentRequestTracker(),
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
} }
} }

@@ -677,7 +677,7 @@ public class PictureInPictureActivity extends AsyncInitializationActivity {
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
getIntentRequestTracker(), getIntentRequestTracker(),
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
} }
@CalledByNative @CalledByNative

@@ -258,7 +258,7 @@ public class SearchActivity extends AsyncInitializationActivity
new ActivityKeyboardVisibilityDelegate(new WeakReference(this)), new ActivityKeyboardVisibilityDelegate(new WeakReference(this)),
getIntentRequestTracker(), getIntentRequestTracker(),
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false) { /* trackOcclusion= */ true) {
@Override @Override
public ModalDialogManager getModalDialogManager() { public ModalDialogManager getModalDialogManager() {
return SearchActivity.this.getModalDialogManager(); return SearchActivity.this.getModalDialogManager();

@@ -272,7 +272,7 @@ public class SigninAndHistorySyncActivity extends FirstRunActivityBase
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
getIntentRequestTracker(), getIntentRequestTracker(),
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
} }
@Override @Override

@@ -99,7 +99,7 @@ public class SyncConsentActivity extends SynchronousInitializationActivity
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
IntentRequestTracker.createFromActivity(this), IntentRequestTracker.createFromActivity(this),
getInsetObserver(), getInsetObserver(),
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
} }
return mWindowAndroid; return mWindowAndroid;
} }

@@ -43,7 +43,7 @@ class CastWebContentsScopes {
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
IntentRequestTracker.createFromActivity(activity), IntentRequestTracker.createFromActivity(activity),
/* insetObserver= */ null, /* insetObserver= */ null,
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
}, },
backgroundColor); backgroundColor);
} }

@@ -55,7 +55,7 @@ public class ThinWebViewImpl extends FrameLayout implements ThinWebView {
/* listenToActivityState= */ true, /* listenToActivityState= */ true,
intentRequestTracker, intentRequestTracker,
/* insetObserver= */ null, /* insetObserver= */ null,
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
} else { } else {
mWindowAndroid = new WindowAndroid(context, /* trackOcclusion= */ false); mWindowAndroid = new WindowAndroid(context, /* trackOcclusion= */ false);
} }

@@ -69,7 +69,7 @@ public class ContentShellActivity extends Activity {
listenToActivityState, listenToActivityState,
mIntentRequestTracker, mIntentRequestTracker,
/* insetObserver= */ null, /* insetObserver= */ null,
/* trackOcclusion= */ false); /* trackOcclusion= */ true);
mIntentRequestTracker.restoreInstanceState(savedInstanceState); mIntentRequestTracker.restoreInstanceState(savedInstanceState);
mShellManager.setWindow(mWindowAndroid); mShellManager.setWindow(mWindowAndroid);
// Set up the animation placeholder to be the SurfaceView. This disables the // Set up the animation placeholder to be the SurfaceView. This disables the