OLD | NEW |
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.widget; | 5 package org.chromium.chrome.browser.widget; |
6 | 6 |
7 import android.content.Context; | 7 import android.content.Context; |
8 import android.view.LayoutInflater; | 8 import android.view.LayoutInflater; |
| 9 import android.view.View; |
9 import android.view.ViewGroup; | 10 import android.view.ViewGroup; |
10 import android.widget.FrameLayout; | 11 import android.widget.FrameLayout; |
11 import android.widget.ListView; | 12 import android.widget.ListView; |
12 | 13 |
13 import org.chromium.base.VisibleForTesting; | 14 import org.chromium.base.VisibleForTesting; |
14 import org.chromium.chrome.R; | 15 import org.chromium.chrome.R; |
15 import org.chromium.chrome.browser.compositor.layouts.Layout; | 16 import org.chromium.chrome.browser.compositor.layouts.Layout; |
16 import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost; | 17 import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost; |
17 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost; | 18 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost; |
18 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; | 19 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 mTabModelWrapper = | 51 mTabModelWrapper = |
51 (AccessibilityTabModelWrapper) LayoutInflater.from(container
.getContext()) | 52 (AccessibilityTabModelWrapper) LayoutInflater.from(container
.getContext()) |
52 .inflate(R.layout.accessibility_tab_switcher, null); | 53 .inflate(R.layout.accessibility_tab_switcher, null); |
53 mTabModelWrapper.setup(this); | 54 mTabModelWrapper.setup(this); |
54 mTabModelWrapper.setTabModelSelector(mTabModelSelector); | 55 mTabModelWrapper.setTabModelSelector(mTabModelSelector); |
55 adjustForFullscreen(); | 56 adjustForFullscreen(); |
56 } | 57 } |
57 | 58 |
58 if (container == null || mTabModelWrapper.getParent() != null) return; | 59 if (container == null || mTabModelWrapper.getParent() != null) return; |
59 | 60 |
60 ((ViewGroup) container.findViewById(R.id.overview_list_layout_holder)) | 61 ViewGroup overviewList = |
61 .addView(mTabModelWrapper); | 62 (ViewGroup) container.findViewById(R.id.overview_list_layout_hol
der); |
| 63 overviewList.setVisibility(View.VISIBLE); |
| 64 overviewList.addView(mTabModelWrapper); |
62 } | 65 } |
63 | 66 |
64 @Override | 67 @Override |
65 public ViewportMode getViewportMode() { | 68 public ViewportMode getViewportMode() { |
66 return ViewportMode.ALWAYS_FULLSCREEN; | 69 return ViewportMode.ALWAYS_FULLSCREEN; |
67 } | 70 } |
68 | 71 |
69 @Override | 72 @Override |
70 protected void notifySizeChanged(float width, float height, int orientation)
{ | 73 protected void notifySizeChanged(float width, float height, int orientation)
{ |
71 adjustForFullscreen(); | 74 adjustForFullscreen(); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 super.startHiding(nextId, hintAtTabSelection); | 148 super.startHiding(nextId, hintAtTabSelection); |
146 | 149 |
147 doneHiding(); | 150 doneHiding(); |
148 } | 151 } |
149 | 152 |
150 @Override | 153 @Override |
151 public void detachViews() { | 154 public void detachViews() { |
152 if (mTabModelSelector != null) mTabModelSelector.commitAllTabClosures(); | 155 if (mTabModelSelector != null) mTabModelSelector.commitAllTabClosures(); |
153 if (mTabModelWrapper != null) { | 156 if (mTabModelWrapper != null) { |
154 ViewGroup parent = (ViewGroup) mTabModelWrapper.getParent(); | 157 ViewGroup parent = (ViewGroup) mTabModelWrapper.getParent(); |
155 if (parent != null) parent.removeView(mTabModelWrapper); | 158 if (parent != null) { |
| 159 parent.setVisibility(View.GONE); |
| 160 parent.removeView(mTabModelWrapper); |
| 161 } |
156 } | 162 } |
157 } | 163 } |
158 | 164 |
159 @Override | 165 @Override |
160 public void setTabModelSelector( | 166 public void setTabModelSelector( |
161 TabModelSelector tabModelSelector, TabContentManager tabContentManag
er) { | 167 TabModelSelector tabModelSelector, TabContentManager tabContentManag
er) { |
162 super.setTabModelSelector(tabModelSelector, tabContentManager); | 168 super.setTabModelSelector(tabModelSelector, tabContentManager); |
163 | 169 |
164 if (mTabModelWrapper == null) return; | 170 if (mTabModelWrapper == null) return; |
165 mTabModelWrapper.setTabModelSelector(tabModelSelector); | 171 mTabModelWrapper.setTabModelSelector(tabModelSelector); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 @Override | 203 @Override |
198 protected EventFilter getEventFilter() { | 204 protected EventFilter getEventFilter() { |
199 return mBlackHoleEventFilter; | 205 return mBlackHoleEventFilter; |
200 } | 206 } |
201 | 207 |
202 @Override | 208 @Override |
203 protected SceneLayer getSceneLayer() { | 209 protected SceneLayer getSceneLayer() { |
204 return mSceneLayer; | 210 return mSceneLayer; |
205 } | 211 } |
206 } | 212 } |
OLD | NEW |