Skip to content

GitLab

T
tangled
Commit 2331eee7 authored by Ted Choc's avatar Ted Choc Committed by Commit Bot
Browse files
Options

Merge toolbar_phone and toolbar_phone_common. 

BUG=871802

Change-Id: Id0f6804e7b644ea11cd581b842c6532f6de1767a
Reviewed-on: https://chromium-review.googlesource.com/1180500Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584273}
parent 8fdb3047
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 80 deletions
chrome/android/java/res/layout/toolbar_phone.xml
View file @ 2331eee7
...@@ -8,10 +8,76 @@ ...@@ -8,10 +8,76 @@
<org.chromium.chrome.browser.toolbar.ToolbarPhone <org.chromium.chrome.browser.toolbar.ToolbarPhone
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_no_shadow" > android:layout_height="@dimen/toolbar_height_no_shadow" >
<include layout="@layout/toolbar_phone_common"/> <org.chromium.chrome.browser.widget.newtab.NewTabButton
android:id="@+id/new_tab_button"
style="@style/ToolbarButton"
android:layout_width="wrap_content"
android:layout_gravity="start|top"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="invisible"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_toolbar_btn_new_tab" />
<org.chromium.chrome.browser.toolbar.HomePageButton
android:id="@+id/home_button"
style="@style/ToolbarButton"
android:src="@drawable/btn_toolbar_home"
android:contentDescription="@string/accessibility_toolbar_btn_home"
android:visibility="gone"
app:chrometint="@color/dark_mode_tint" />
<org.chromium.chrome.browser.omnibox.LocationBarPhone
android:id="@+id/location_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="top" />
<LinearLayout android:id="@+id/toolbar_buttons"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end" >
<Space
android:layout_width="4dp"
android:layout_height="match_parent" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top" >
<ViewStub
android:id="@+id/experimental_button_stub"
android:inflatedId="@+id/experimental_toolbar_button"
android:layout="@layout/experimental_toolbar_button"
style="@style/ToolbarButton"
android:paddingStart="8dp"
android:visibility="gone" />
<ViewStub
android:id="@+id/incognito_button_stub"
android:inflatedId="@+id/incognito_button"
android:layout="@layout/toolbar_phone_incognito_button"
style="@style/ToolbarButton"
android:contentDescription="@string/accessibility_tabstrip_btn_incognito_toggle_standard"
android:visibility="gone" />
</FrameLayout>
<ImageButton android:id="@+id/tab_switcher_button"
style="@style/ToolbarButton"
android:paddingStart="8dp"
android:layout_gravity="top"
android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle_default" />
<include layout="@layout/menu_button"/>
</LinearLayout>
</org.chromium.chrome.browser.toolbar.ToolbarPhone> </org.chromium.chrome.browser.toolbar.ToolbarPhone>
chrome/android/java/res/layout/toolbar_phone_common.xml deleted 100644 → 0
View file @ 8fdb3047
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<!-- The toolbar containing the URL bar, back button, and NTP button.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.chromium.chrome.browser.widget.newtab.NewTabButton
android:id="@+id/new_tab_button"
style="@style/ToolbarButton"
android:layout_width="wrap_content"
android:layout_gravity="start|top"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="invisible"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_toolbar_btn_new_tab" />
<org.chromium.chrome.browser.toolbar.HomePageButton
android:id="@+id/home_button"
style="@style/ToolbarButton"
android:src="@drawable/btn_toolbar_home"
android:contentDescription="@string/accessibility_toolbar_btn_home"
android:visibility="gone"
app:chrometint="@color/dark_mode_tint" />
<org.chromium.chrome.browser.omnibox.LocationBarPhone
android:id="@+id/location_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="top" />
<LinearLayout android:id="@+id/toolbar_buttons"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end" >
<Space
android:layout_width="4dp"
android:layout_height="match_parent" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top" >
<ViewStub
android:id="@+id/experimental_button_stub"
android:inflatedId="@+id/experimental_toolbar_button"
android:layout="@layout/experimental_toolbar_button"
style="@style/ToolbarButton"
android:paddingStart="8dp"
android:visibility="gone" />
<ViewStub
android:id="@+id/incognito_button_stub"
android:inflatedId="@+id/incognito_button"
android:layout="@layout/toolbar_phone_incognito_button"
style="@style/ToolbarButton"
android:contentDescription="@string/accessibility_tabstrip_btn_incognito_toggle_standard"
android:visibility="gone" />
</FrameLayout>
<ImageButton android:id="@+id/tab_switcher_button"
style="@style/ToolbarButton"
android:paddingStart="8dp"
android:layout_gravity="top"
android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle_default" />
<include layout="@layout/menu_button"/>
</LinearLayout>
</merge>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment