Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 <?xml version="1.0" encoding="utf-8"?> | |
|
mcwilliams
2016/03/21 12:45:50
Is there a way to preserve the history from new_pa
Bernhard Bauer
2016/03/21 15:13:56
You could try running `git cl upload` with the --s
newt (away)
2016/03/23 05:29:37
Also, the change in indentation will probably thwa
| |
| 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | |
| 3 Use of this source code is governed by a BSD-style license that can be | |
| 4 found in the LICENSE file. --> | |
| 5 <org.chromium.chrome.browser.ntp.NewTabPageLayout | |
|
newt (away)
2016/03/23 05:29:37
were there any changes here, or was this a pure mo
May
2016/03/23 19:22:55
This was a pure move.
| |
| 6 xmlns:android="http://schemas.android.com/apk/res/android" | |
| 7 xmlns:chrome="http://schemas.android.com/apk/res-auto" | |
| 8 android:id="@+id/ntp_content" | |
| 9 android:layout_width="match_parent" | |
| 10 android:layout_height="match_parent" | |
| 11 android:layout_gravity="center_horizontal" | |
| 12 android:orientation="vertical" | |
| 13 android:gravity="center" | |
| 14 android:paddingTop="@dimen/toolbar_height_no_shadow" | |
| 15 android:visibility="gone" | |
| 16 chrome:maxWidth="692dp" > | |
| 17 | |
| 18 <!-- Spacer. Note: this must have layout_weight="1" and the other spacers mu st have | |
| 19 layout_weight="0". The NewTabPageLayout will redistribute the extra spa ce between | |
| 20 them. --> | |
| 21 <View | |
| 22 android:id="@+id/ntp_top_spacer" | |
| 23 android:layout_width="0dp" | |
| 24 android:layout_height="0dp" | |
| 25 android:layout_weight="1" | |
| 26 android:visibility="invisible" /> | |
| 27 | |
| 28 <!-- Search provider logo --> | |
| 29 <org.chromium.chrome.browser.ntp.LogoView | |
| 30 android:id="@+id/search_provider_logo" | |
| 31 android:layout_width="wrap_content" | |
| 32 android:layout_height="@dimen/ntp_logo_height" | |
| 33 android:layout_marginStart="16dp" | |
| 34 android:layout_marginEnd="16dp" | |
| 35 android:layout_marginTop="26dp" | |
| 36 android:layout_marginBottom="30dp" | |
| 37 android:src="@drawable/google_logo" /> | |
| 38 | |
| 39 <!-- Search box --> | |
| 40 <LinearLayout | |
| 41 android:id="@+id/search_box" | |
| 42 android:layout_width="match_parent" | |
| 43 android:layout_height="48dp" | |
| 44 android:layout_marginStart="12dp" | |
| 45 android:layout_marginEnd="12dp" | |
| 46 android:layout_marginBottom="8dp" | |
| 47 android:gravity="center_vertical" | |
| 48 android:background="@drawable/bg_ntp_search_box" | |
| 49 android:orientation="horizontal" > | |
| 50 <EditText | |
| 51 android:id="@+id/search_box_text" | |
| 52 android:layout_width="0dp" | |
| 53 android:layout_height="match_parent" | |
| 54 android:layout_marginStart="12dp" | |
| 55 android:layout_weight="1" | |
| 56 android:background="@null" | |
| 57 android:ellipsize="end" | |
| 58 android:focusableInTouchMode="false" | |
| 59 android:gravity="center_vertical" | |
| 60 android:inputType="text" | |
| 61 android:singleLine="true" | |
| 62 android:textSize="@dimen/location_bar_url_text_size" /> | |
| 63 <org.chromium.chrome.browser.widget.TintedImageView | |
| 64 android:id="@+id/voice_search_button" | |
| 65 android:layout_width="wrap_content" | |
| 66 android:layout_height="wrap_content" | |
| 67 android:layout_marginStart="8dp" | |
| 68 android:layout_marginEnd="8dp" | |
| 69 android:contentDescription="@string/accessibility_toolbar_btn_mic" | |
| 70 android:src="@drawable/btn_mic" /> | |
| 71 </LinearLayout> | |
| 72 | |
| 73 <!-- Spacer --> | |
| 74 <View | |
| 75 android:id="@+id/ntp_middle_spacer" | |
| 76 android:layout_width="0dp" | |
| 77 android:layout_height="0dp" | |
| 78 android:layout_weight="0" | |
| 79 android:visibility="invisible" /> | |
| 80 | |
| 81 <!-- Document mode opt out promo --> | |
| 82 <ViewStub | |
| 83 android:id="@+id/opt_out_promo_stub" | |
| 84 android:layout_width="match_parent" | |
| 85 android:layout_height="wrap_content" | |
| 86 android:inflatedId="@+id/opt_out_promo" | |
| 87 android:layout="@layout/opt_out_promo" /> | |
| 88 | |
| 89 <!-- Most visited items --> | |
| 90 <org.chromium.chrome.browser.ntp.MostVisitedLayout | |
| 91 android:id="@+id/most_visited_layout" | |
| 92 android:layout_width="wrap_content" | |
| 93 android:layout_height="wrap_content" | |
| 94 android:layout_marginBottom="16dp" | |
| 95 android:layout_marginStart="12dp" | |
| 96 android:layout_marginEnd="12dp" | |
| 97 android:layout_gravity="center_horizontal" | |
| 98 android:paddingTop="@dimen/most_visited_layout_padding_top" | |
| 99 android:paddingBottom="4dp" /> | |
| 100 | |
| 101 <!-- Most visited items placeholder --> | |
| 102 <ViewStub | |
| 103 android:id="@+id/most_visited_placeholder_stub" | |
| 104 android:layout_width="match_parent" | |
| 105 android:layout_height="wrap_content" | |
| 106 android:layout_weight="1" | |
| 107 android:inflatedId="@+id/most_visited_placeholder" | |
| 108 android:layout="@layout/most_visited_placeholder" /> | |
| 109 | |
| 110 <!-- Spacer --> | |
| 111 <View | |
| 112 android:id="@+id/ntp_bottom_spacer" | |
| 113 android:layout_width="0dp" | |
| 114 android:layout_height="0dp" | |
| 115 android:layout_weight="0" | |
| 116 android:visibility="invisible" /> | |
| 117 | |
| 118 <View | |
| 119 android:id="@+id/no_search_logo_spacer" | |
| 120 android:layout_width="match_parent" | |
| 121 android:layout_height="0dp" | |
| 122 android:layout_weight="1" | |
| 123 android:visibility="gone" /> | |
| 124 | |
| 125 <View | |
| 126 android:id="@+id/ntp_scroll_spacer" | |
| 127 android:layout_width="match_parent" | |
| 128 android:layout_height="0dp" | |
| 129 android:visibility="gone" /> | |
| 130 </org.chromium.chrome.browser.ntp.NewTabPageLayout> | |
| OLD | NEW |