Chromium Code Reviews Chromium Code Reviews
Issue 1386403003:
Resize only the virtual viewport when the OSK triggers a resize. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
|
ymalik
2016/01/28 02:09:36
FYI, The differ doesn't see this, but all I am doi
| |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 7 <LinearLayout | 7 <org.chromium.chrome.browser.InsetConsumerView |
| 8 android:id="@+id/inset_consumer_view" | |
| 8 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
| 9 android:layout_height="match_parent" | 10 android:layout_height="match_parent" |
| 10 android:orientation="vertical"> | 11 android:orientation="vertical"> |
| 11 | 12 |
| 12 <org.chromium.chrome.browser.compositor.CompositorViewHolder | 13 <LinearLayout |
| 13 android:id="@+id/compositor_view_holder" | |
| 14 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
| 15 android:layout_height="0dp" | 15 android:layout_height="match_parent" |
| 16 android:layout_weight="1" /> | 16 android:orientation="vertical"> |
| 17 | 17 |
| 18 <HorizontalScrollView | 18 <org.chromium.chrome.browser.compositor.CompositorViewHolder |
| 19 android:id="@+id/keyboard_accessory" | 19 android:id="@+id/compositor_view_holder" |
| 20 android:layout_height="@dimen/keyboard_accessory_height" | 20 android:layout_width="match_parent" |
| 21 android:layout_width="match_parent" | 21 android:layout_height="0dp" |
| 22 android:background="@drawable/keyboard_accessory_background" | 22 android:layout_weight="1" /> |
| 23 android:contentDescription="@string/autofill_keyboard_accessory_cont ent_description" | |
| 24 android:fillViewport="true" | |
| 25 android:scrollbars="none" | |
| 26 android:visibility="gone" /> | |
| 27 | 23 |
| 28 <org.chromium.chrome.browser.widget.FadingShadowView | 24 <HorizontalScrollView |
| 29 android:id="@+id/bottombar_shadow" | 25 android:id="@+id/keyboard_accessory" |
| 30 android:layout_width="match_parent" | 26 android:layout_height="@dimen/keyboard_accessory_height" |
| 31 android:layout_height="2dp" | 27 android:layout_width="match_parent" |
| 32 android:layout_marginTop="-2dp" | 28 android:background="@drawable/keyboard_accessory_background" |
| 33 android:visibility="gone" /> | 29 android:contentDescription="@string/autofill_keyboard_accessory_ content_description" |
| 30 android:fillViewport="true" | |
| 31 android:scrollbars="none" | |
| 32 android:visibility="gone" /> | |
| 33 | |
| 34 <org.chromium.chrome.browser.widget.FadingShadowView | |
| 35 android:id="@+id/bottombar_shadow" | |
| 36 android:layout_width="match_parent" | |
| 37 android:layout_height="2dp" | |
| 38 android:layout_marginTop="-2dp" | |
| 39 android:visibility="gone" /> | |
| 40 | |
| 41 <ViewStub | |
| 42 android:id="@+id/bottombar_stub" | |
| 43 android:layout_width="match_parent" | |
| 44 android:layout_height="wrap_content" /> | |
| 45 | |
| 46 </LinearLayout> | |
| 34 | 47 |
| 35 <ViewStub | 48 <ViewStub |
| 36 android:id="@+id/bottombar_stub" | 49 android:id="@+id/omnibox_results_container_stub" |
| 50 android:layout_width="match_parent" | |
| 51 android:layout_height="match_parent" | |
| 52 android:layout_marginTop="@dimen/tab_strip_height" | |
| 53 android:inflatedId="@+id/omnibox_results_container" | |
| 54 android:layout="@layout/omnibox_results_container" /> | |
| 55 | |
| 56 <!-- Toolbar size area painted black to avoid the action bar showing the window background --> | |
| 57 <View | |
| 58 android:id="@+id/action_bar_black_background" | |
| 59 android:layout_width="match_parent" | |
| 60 android:layout_height="@dimen/toolbar_height_no_shadow" | |
| 61 android:background="#000000" | |
| 62 android:visibility="gone" /> | |
| 63 <ViewStub | |
| 64 android:id="@+id/control_container_stub" | |
| 37 android:layout_width="match_parent" | 65 android:layout_width="match_parent" |
| 38 android:layout_height="wrap_content" /> | 66 android:layout_height="wrap_content" /> |
| 39 </LinearLayout> | 67 <ViewStub |
| 68 android:id="@+id/empty_container_stub" | |
| 69 android:inflatedId="@+id/empty_container" | |
| 70 android:layout="@layout/empty_background_view" | |
| 71 android:layout_width="match_parent" | |
| 72 android:layout_height="match_parent" /> | |
| 73 <!-- This empty view is used as the anchor for custom menu --> | |
| 74 <View | |
| 75 android:id="@+id/menu_anchor_stub" | |
| 76 android:layout_width="0px" | |
| 77 android:layout_height="0px" | |
| 78 android:layout_gravity="bottom|start" | |
| 79 /> | |
| 40 | 80 |
| 41 <ViewStub | 81 </org.chromium.chrome.browser.InsetConsumerView> |
| 42 android:id="@+id/omnibox_results_container_stub" | |
| 43 android:layout_width="match_parent" | |
| 44 android:layout_height="match_parent" | |
| 45 android:layout_marginTop="@dimen/tab_strip_height" | |
| 46 android:inflatedId="@+id/omnibox_results_container" | |
| 47 android:layout="@layout/omnibox_results_container" /> | |
| 48 | |
| 49 <!-- Toolbar size area painted black to avoid the action bar showing the win dow background --> | |
| 50 <View | |
| 51 android:id="@+id/action_bar_black_background" | |
| 52 android:layout_width="match_parent" | |
| 53 android:layout_height="@dimen/toolbar_height_no_shadow" | |
| 54 android:background="#000000" | |
| 55 android:visibility="gone" /> | |
| 56 <ViewStub | |
| 57 android:id="@+id/control_container_stub" | |
| 58 android:layout_width="match_parent" | |
| 59 android:layout_height="wrap_content" /> | |
| 60 <ViewStub | |
| 61 android:id="@+id/empty_container_stub" | |
| 62 android:inflatedId="@+id/empty_container" | |
| 63 android:layout="@layout/empty_background_view" | |
| 64 android:layout_width="match_parent" | |
| 65 android:layout_height="match_parent" /> | |
| 66 <!-- This empty view is used as the anchor for custom menu --> | |
| 67 <View | |
| 68 android:id="@+id/menu_anchor_stub" | |
| 69 android:layout_width="0px" | |
| 70 android:layout_height="0px" | |
| 71 android:layout_gravity="bottom|start" | |
| 72 /> | |
| 73 </merge> | 82 </merge> |
| OLD | NEW |
