Skip to content

GitLab

T
tangled
Commit be606d08 authored by aurimas's avatar aurimas Committed by Commit bot
Browse files
Options

Use TintedImageButton for accessibility tab switcher. 

Close icon switched approved in crbug.com/455002

BUG=455002

Review URL: https://codereview.chromium.org/894453004

Cr-Commit-Position: refs/heads/master@{#314650}
parent 49c19035
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 63 deletions
chrome/android/java/res/drawable/btn_tab_close.xml deleted 100644 → 0
View file @ 49c19035
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/tab_close_white" />
<item android:state_pressed="true"
android:drawable="@drawable/tab_close_white_active" />
<item android:state_selected="true"
android:drawable="@drawable/tab_close_white_active" />
<item android:state_focused="true"
android:drawable="@drawable/tab_close_white_active" />
<item android:drawable="@drawable/tab_close_white" />
</selector>
\ No newline at end of file
chrome/android/java/res/drawable/btn_tabstrip_incognito_switch.xml deleted 100644 → 0
View file @ 49c19035
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/tabstrip_incognito_switch_normal" />
<item android:state_pressed="true"
android:drawable="@drawable/tabstrip_incognito_switch_normal_active" />
<item android:state_selected="true"
android:drawable="@drawable/tabstrip_incognito_switch_normal_active" />
<item android:state_focused="true"
android:drawable="@drawable/tabstrip_incognito_switch_normal_active" />
<item android:drawable="@drawable/tabstrip_incognito_switch_normal" />
</selector>
\ No newline at end of file
chrome/android/java/res/drawable/btn_tabstrip_incognito_switch_incognito.xml deleted 100644 → 0
View file @ 49c19035
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/tabstrip_incognito_switch_incognito" />
<item android:state_pressed="true"
android:drawable="@drawable/tabstrip_incognito_switch_incognito_active" />
<item android:state_selected="true"
android:drawable="@drawable/tabstrip_incognito_switch_incognito_active" />
<item android:state_focused="true"
android:drawable="@drawable/tabstrip_incognito_switch_incognito_active" />
<item android:drawable="@drawable/tabstrip_incognito_switch_incognito" />
</selector>
\ No newline at end of file
chrome/android/java/res/layout/accessibility_tab_switcher.xml
View file @ be606d08
......@@ -8,6 +8,7 @@
<org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelWrapper
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:chrome="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
......@@ -30,13 +31,14 @@
android:id="@+id/button_wrapper"
android:visibility="gone">
<ImageButton
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/standard_tabs_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/btn_bg_holo_active"
android:src="@drawable/btn_tabstrip_incognito_switch"
android:src="@drawable/btn_normal_tabs"
chrome:tint="@color/light_mode_tint"
android:contentDescription="@string/accessibility_tab_switcher_standard_stack"
style="?android:attr/borderlessButtonStyle" />
......@@ -46,12 +48,13 @@
android:layout_gravity="center_vertical"
android:background="#292929" />
<ImageButton
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/incognito_tabs_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/btn_tabstrip_incognito_switch_incognito"
android:src="@drawable/btn_incognito_tabs"
chrome:tint="@color/light_mode_tint"
android:background="@drawable/btn_bg_holo"
android:contentDescription="@string/accessibility_tab_switcher_incognito_stack"
style="?android:attr/borderlessButtonStyle" />
......
chrome/android/java/res/layout/accessibility_tab_switcher_list_item.xml
View file @ be606d08
......@@ -8,6 +8,7 @@
<org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelListItem
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:chrome="http://schemas.android.com/apk/res-auto"
android:id="@+id/list_item_frame"
android:layout_width="match_parent"
android:layout_height="@dimen/accessibility_tab_height">
......@@ -40,7 +41,7 @@
android:padding="4dp"
android:textColor="@android:color/white"
android:textSize="18sp" />
<ImageButton
<org.chromium.chrome.browser.widget.TintedImageButton
android:id="@+id/close_btn"
android:scaleType="centerInside"
android:layout_width="wrap_content"
......@@ -49,7 +50,8 @@
android:padding="4dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/accessibility_tabstrip_btn_close_tab"
android:src="@drawable/btn_tab_close"
android:src="@drawable/btn_close"
chrome:tint="@color/light_mode_tint"
android:gravity="end|center_vertical" />
</LinearLayout>
......
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