Skip to content

Commit

Permalink
update resource using src/build/android/gyp/generate_v14_compatible_r…
Browse files Browse the repository at this point in the history
…esources.py.

you can refer to crbug.com/235118 for more information.
  • Loading branch information
mogoweb committed Nov 6, 2015
1 parent 2632a67 commit 597c437
Show file tree
Hide file tree
Showing 137 changed files with 6,931 additions and 3,472 deletions.
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 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. -->

<org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewTablet
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:chrome="http://schemas.android.com/apk/res-auto"
android:id="@+id/empty_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:background="@color/tab_switcher_background">
<LinearLayout
android:id="@+id/empty_layout_button_container"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top|start"
android:paddingTop="@dimen/menu_negative_software_vertical_offset">
<view class="org.chromium.chrome.browser.widget.newtab.NewTabButton"
android:id="@+id/empty_new_tab_button"
style="@style/ToolbarButton"
android:layout_width="wrap_content"
android:layout_gravity="start|top"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:src="@drawable/btn_new_tab_white"
android:gravity="center_vertical"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_tabstrip_btn_empty_new_tab"
/>
<View
android:layout_weight="1.0"
android:layout_height="wrap_content"
android:layout_width="0dp" />
<org.chromium.chrome.browser.widget.incognitotoggle.IncognitoToggleButtonTablet
android:id="@+id/empty_incognito_toggle_button"
android:layout_width="48dp"
android:layout_height="@dimen/toolbar_height_no_shadow"
android:visibility="gone"
android:scaleType="center"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_tabstrip_btn_incognito_toggle_standard"
/>
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/empty_menu_button"
style="@style/ToolbarButton"
android:layout_width="48dp"
android:layout_height="@dimen/toolbar_height_no_shadow"
android:src="@drawable/btn_menu"
android:scaleType="center"
android:contentDescription="@string/accessibility_toolbar_btn_menu"
android:paddingStart="2dp"
chrome:tint="@color/light_mode_tint"
/>
</LinearLayout>
</org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewTablet>
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 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 location bar also know as URL bar -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout android:id="@+id/location_bar_icon"
android:layout_width="@dimen/location_bar_icon_width"
android:layout_height="match_parent"
android:layout_gravity="start|center_vertical">
<ImageView android:id="@+id/navigation_button"
style="@style/LocationBarButton"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_omnibox_page"
android:scaleType="center"
android:contentDescription="@string/accessibility_toolbar_btn_site_info"/>
<ImageButton android:id="@+id/security_button"
style="@style/LocationBarButton"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:scaleType="center"
android:layout_gravity="center"
android:alpha="0"
android:visibility="invisible"
android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
</FrameLayout>
<include
android:id="@+id/url_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:layout_marginStart="@dimen/location_bar_icon_width"
android:layout_marginEnd="80dp"
android:layout_gravity="center_vertical"
android:nextFocusForward="@+id/menu_button"
layout="@layout/url_container"
/>
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/delete_button"
style="@style/LocationBarButton"
android:layout_width="40dp"
android:layout_height="match_parent"
android:scaleType="center"
android:layout_marginEnd="44dp"
android:layout_gravity="end"
android:src="@drawable/btn_delete_url"
android:visibility="gone"
android:contentDescription="@string/accessibility_toolbar_btn_delete_url" />
<!-- delete_button and bookmark_button overlap, so they should have the same right margin -->
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/bookmark_button"
style="@style/LocationBarButton"
android:layout_width="40dp"
android:layout_height="match_parent"
android:scaleType="center"
android:layout_marginEnd="40dp"
android:layout_gravity="end"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:contentDescription="@string/accessibility_menu_bookmark" />
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/mic_button"
style="@style/LocationBarButton"
android:layout_width="40dp"
android:layout_height="match_parent"
android:scaleType="center"
android:layout_gravity="end"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:nextFocusForward="@+id/menu_button"
android:src="@drawable/btn_mic"
android:contentDescription="@string/accessibility_toolbar_btn_mic" />
</merge>
66 changes: 66 additions & 0 deletions libraries/chrome_res/src/main/res/layout-sw600dp-v17/toolbar.xml
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 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.
-->

<org.chromium.chrome.browser.toolbar.ToolbarTablet
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_no_shadow"
android:layout_marginTop="@dimen/tab_strip_height"
android:background="@color/default_primary_color" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="4dp"
android:orientation="horizontal">
<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" />
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/back_button"
style="@style/ToolbarButton"
android:src="@drawable/btn_back"
android:contentDescription="@string/accessibility_toolbar_btn_back" />
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/forward_button"
style="@style/ToolbarButton"
android:src="@drawable/btn_forward"
android:contentDescription="@string/accessibility_toolbar_btn_forward" />
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/refresh_button"
style="@style/ToolbarButton"
android:src="@drawable/btn_toolbar_reload"
android:contentDescription="@string/accessibility_btn_refresh" />
<org.chromium.chrome.browser.omnibox.LocationBarTablet
android:id="@+id/location_bar"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:layout_gravity="top|center"
android:background="@drawable/textbox"
android:paddingEnd="1dp"
android:paddingStart="2dp"
/>
<ImageButton
android:id="@+id/tab_switcher_button"
style="@style/ToolbarButton"
android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle"
android:visibility="gone" />
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/menu_button"
style="@style/ToolbarButton"
android:src="@drawable/btn_menu"
android:contentDescription="@string/accessibility_toolbar_btn_menu"
android:layout_width="43dp"
android:paddingEnd="3.5dp" />
</LinearLayout>
</org.chromium.chrome.browser.toolbar.ToolbarTablet>
Expand Up @@ -2,57 +2,25 @@
<!-- Copyright 2015 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. -->
<org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewTablet android:background="@color/tab_switcher_background" android:id="@+id/empty_container" android:layout_height="match_parent" android:layout_width="match_parent" android:visibility="gone" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:chrome="http://schemas.android.com/apk/res-auto">


<LinearLayout android:id="@+id/empty_layout_button_container" android:layout_gravity="top|start" android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="horizontal" android:paddingTop="@dimen/menu_negative_software_vertical_offset">


<view android:background="?attr/selectableItemBackground" android:contentDescription="@string/accessibility_tabstrip_btn_empty_new_tab" android:gravity="center_vertical" android:id="@+id/empty_new_tab_button" android:layout_gravity="start|top" android:layout_width="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" android:src="@drawable/btn_new_tab_white" class="org.chromium.chrome.browser.widget.newtab.NewTabButton" style="@style/ToolbarButton"/>


<View android:layout_height="wrap_content" android:layout_weight="1.0" android:layout_width="0dp"/>


<org.chromium.chrome.browser.widget.incognitotoggle.IncognitoToggleButtonTablet android:background="?attr/selectableItemBackground" android:contentDescription="@string/accessibility_tabstrip_btn_incognito_toggle_standard" android:id="@+id/empty_incognito_toggle_button" android:layout_height="@dimen/toolbar_height_no_shadow" android:layout_width="48dp" android:scaleType="center" android:visibility="gone"/>


<org.chromium.chrome.browser.widget.TintedImageButton android:contentDescription="@string/accessibility_toolbar_btn_menu" android:id="@+id/empty_menu_button" android:layout_height="@dimen/toolbar_height_no_shadow" android:layout_width="48dp" android:paddingLeft="2dp" android:scaleType="center" android:src="@drawable/btn_menu" chrome:tint="@color/light_mode_tint" style="@style/ToolbarButton"/>


</LinearLayout>


<org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewTablet
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:chrome="http://schemas.android.com/apk/res-auto"
android:id="@+id/empty_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:background="@color/tab_switcher_background">
<LinearLayout
android:id="@+id/empty_layout_button_container"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top|start"
android:paddingTop="@dimen/menu_negative_software_vertical_offset">
<view class="org.chromium.chrome.browser.widget.newtab.NewTabButton"
android:id="@+id/empty_new_tab_button"
style="@style/ToolbarButton"
android:layout_width="wrap_content"
android:layout_gravity="start|top"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:src="@drawable/btn_new_tab_white"
android:gravity="center_vertical"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_tabstrip_btn_empty_new_tab"
/>
<View
android:layout_weight="1.0"
android:layout_height="wrap_content"
android:layout_width="0dp" />
<org.chromium.chrome.browser.widget.incognitotoggle.IncognitoToggleButtonTablet
android:id="@+id/empty_incognito_toggle_button"
android:layout_width="48dp"
android:layout_height="@dimen/toolbar_height_no_shadow"
android:visibility="gone"
android:scaleType="center"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_tabstrip_btn_incognito_toggle_standard"
/>
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/empty_menu_button"
style="@style/ToolbarButton"
android:layout_width="48dp"
android:layout_height="@dimen/toolbar_height_no_shadow"
android:src="@drawable/btn_menu"
android:scaleType="center"
android:contentDescription="@string/accessibility_toolbar_btn_menu"
android:paddingStart="2dp"
chrome:tint="@color/light_mode_tint"
/>
</LinearLayout>
</org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewTablet>

0 comments on commit 597c437

Please sign in to comment.