Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Issue 2201483002: Improve transition between opaque and translucent compositor views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: now without VR-breaking badness Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManager.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser; 5 package org.chromium.chrome.browser;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.annotation.TargetApi; 8 import android.annotation.TargetApi;
9 import android.app.Activity; 9 import android.app.Activity;
10 import android.app.SearchManager; 10 import android.app.SearchManager;
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 } 336 }
337 }; 337 };
338 manager.addTouchExplorationStateChangeListener(mTouchExplorationStat eChangeListener); 338 manager.addTouchExplorationStateChangeListener(mTouchExplorationStat eChangeListener);
339 } 339 }
340 340
341 // Make the activity listen to policy change events 341 // Make the activity listen to policy change events
342 CombinedPolicyProvider.get().addPolicyChangeListener(this); 342 CombinedPolicyProvider.get().addPolicyChangeListener(this);
343 343
344 // Set up the animation placeholder to be the SurfaceView. This disables the 344 // Set up the animation placeholder to be the SurfaceView. This disables the
345 // SurfaceView's 'hole' clipping during animations that are notified to the window. 345 // SurfaceView's 'hole' clipping during animations that are notified to the window.
346 mWindowAndroid.setAnimationPlaceholderView(mCompositorViewHolder.getSurf aceView()); 346 mWindowAndroid.setAnimationPlaceholderView(mCompositorViewHolder.getComp ositorView());
347 347
348 // Inform the WindowAndroid of the keyboard accessory view. 348 // Inform the WindowAndroid of the keyboard accessory view.
349 mWindowAndroid.setKeyboardAccessoryView((ViewGroup) findViewById(R.id.ke yboard_accessory)); 349 mWindowAndroid.setKeyboardAccessoryView((ViewGroup) findViewById(R.id.ke yboard_accessory));
350 initializeToolbar(); 350 initializeToolbar();
351 initializeTabModels(); 351 initializeTabModels();
352 if (!isFinishing() && getFullscreenManager() != null) { 352 if (!isFinishing() && getFullscreenManager() != null) {
353 getFullscreenManager().initialize( 353 getFullscreenManager().initialize(
354 (ControlContainer) findViewById(R.id.control_container), 354 (ControlContainer) findViewById(R.id.control_container),
355 getTabModelSelector(), 355 getTabModelSelector(),
356 getControlContainerHeightResource()); 356 getControlContainerHeightResource());
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
2105 * draw over VR contents should be hidden in this call. 2105 * draw over VR contents should be hidden in this call.
2106 */ 2106 */
2107 public void onEnterVR() {} 2107 public void onEnterVR() {}
2108 2108
2109 /** 2109 /**
2110 * Called when VR mode using this activity is exited. Any state set for VR s hould be restored 2110 * Called when VR mode using this activity is exited. Any state set for VR s hould be restored
2111 * in this call, including showing 2D UI that was hidden. 2111 * in this call, including showing 2D UI that was hidden.
2112 */ 2112 */
2113 public void onExitVR() {} 2113 public void onExitVR() {}
2114 } 2114 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManager.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698