Chromium Code Reviews Chromium Code Reviews
Issue 682883002:
Introduce TintedImageButton class. (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"?> |
| 2 | 2 |
| 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. | 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. |
| 4 | 4 |
| 5 Use of this source code is governed by a BSD-style license that can be | 5 Use of this source code is governed by a BSD-style license that can be |
| 6 found in the LICENSE file. | 6 found in the LICENSE file. |
| 7 --> | 7 --> |
| 8 | 8 |
| 9 <org.chromium.chrome.shell.TabManager android:id="@+id/tab_manager" | 9 <org.chromium.chrome.shell.TabManager android:id="@+id/tab_manager" |
| 10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
| 11 xmlns:chrome="http://schemas.android.com/apk/res-auto" | |
| 11 android:layout_width="match_parent" | 12 android:layout_width="match_parent" |
| 12 android:layout_height="match_parent" | 13 android:layout_height="match_parent" |
| 13 android:orientation="vertical"> | 14 android:orientation="vertical"> |
| 14 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar" | 15 <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar" |
| 15 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
| 16 android:layout_height="wrap_content" | 17 android:layout_height="wrap_content" |
| 17 android:orientation="horizontal" | 18 android:orientation="horizontal" |
| 18 android:background="@drawable/progress"> | 19 android:background="@drawable/progress"> |
| 19 <ImageButton android:id="@+id/stop_reload_button" | 20 <org.chromium.chrome.browser.widget.TintedImageButton |
| 21 android:id="@+id/stop_reload_button" | |
| 20 android:layout_width="38dp" | 22 android:layout_width="38dp" |
| 21 android:layout_height="38dp" | 23 android:layout_height="38dp" |
| 22 android:src="@drawable/btn_stop_normal" | 24 android:src="@drawable/btn_toolbar_stop_loading_white_normal" |
| 23 android:scaleType="center" /> | 25 android:background="?android:attr/selectableItemBackground" |
| 26 android:scaleType="center" | |
| 27 chrome:tint="@color/default_tint"/> | |
|
David Trainor- moved to gerrit
2014/10/27 23:58:59
Should we have a default button style that applies
| |
| 24 <EditText android:id="@+id/url" | 28 <EditText android:id="@+id/url" |
| 25 android:layout_width="0dp" | 29 android:layout_width="0dp" |
| 26 android:layout_height="wrap_content" | 30 android:layout_height="wrap_content" |
| 27 android:layout_weight="1" | 31 android:layout_weight="1" |
| 28 android:gravity="bottom" | 32 android:gravity="bottom" |
| 29 android:textSize="18sp" | 33 android:textSize="18sp" |
| 30 android:autoText="true" | 34 android:autoText="true" |
| 31 android:capitalize="sentences" | 35 android:capitalize="sentences" |
| 32 android:singleLine="true" | 36 android:singleLine="true" |
| 33 android:selectAllOnFocus="true" | 37 android:selectAllOnFocus="true" |
| 34 android:hint="@string/url_hint" | 38 android:hint="@string/url_hint" |
| 35 android:inputType="textUri" | 39 android:inputType="textUri" |
| 36 android:imeOptions="actionGo|flagNoExtractUi" /> | 40 android:imeOptions="actionGo|flagNoExtractUi" /> |
| 37 <ImageButton android:id="@+id/tab_switcher" | 41 <org.chromium.chrome.browser.widget.TintedImageButton |
| 42 android:id="@+id/tab_switcher" | |
| 38 android:layout_width="38dp" | 43 android:layout_width="38dp" |
| 39 android:layout_height="38dp" | 44 android:layout_height="38dp" |
| 40 android:src="@drawable/tab_switcher" | 45 android:src="@drawable/btn_tabswitcher_white_normal" |
| 41 android:background="?android:attr/selectableItemBackground" | 46 android:background="?android:attr/selectableItemBackground" |
| 42 android:scaleType="center" | 47 android:scaleType="center" |
| 43 android:contentDescription="@null" /> | 48 android:contentDescription="@null" |
| 44 <ImageButton android:id="@+id/menu_button" | 49 chrome:tint="@color/default_tint"/> |
| 50 <org.chromium.chrome.browser.widget.TintedImageButton | |
| 51 android:id="@+id/menu_button" | |
| 45 android:layout_width="38dp" | 52 android:layout_width="38dp" |
| 46 android:layout_height="38dp" | 53 android:layout_height="38dp" |
| 47 android:src="@drawable/btn_menu" | 54 android:src="@drawable/btn_menu_white_normal" |
| 48 android:background="?android:attr/selectableItemBackground" | 55 android:background="?android:attr/selectableItemBackground" |
| 49 android:scaleType="center" /> | 56 android:scaleType="center" |
| 57 chrome:tint="@color/default_tint"/> | |
| 50 </org.chromium.chrome.shell.ChromeShellToolbar> | 58 </org.chromium.chrome.shell.ChromeShellToolbar> |
| 51 <FrameLayout android:id="@+id/content_container" | 59 <FrameLayout android:id="@+id/content_container" |
| 52 android:layout_width="match_parent" | 60 android:layout_width="match_parent" |
| 53 android:layout_height="0dp" | 61 android:layout_height="0dp" |
| 54 android:layout_weight="1"> | 62 android:layout_weight="1"> |
| 55 </FrameLayout> | 63 </FrameLayout> |
| 56 | 64 |
| 57 </org.chromium.chrome.shell.TabManager> | 65 </org.chromium.chrome.shell.TabManager> |
| OLD | NEW |
