Skip to content

GitLab

T
tangled
Commit c0198f64 authored by aurimas@google.com's avatar aurimas@google.com
Browse files
Options

[Android] Updating menu assets. 

Updating AppMenu back, forward, and star assets to the latest spec.

BUG=375379
R=dtrainor@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272323 0039d316-1c4b-4281-b951-d872f2087c98
parent a486896f
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 15 deletions
chrome/android/java/res/drawable/back_button_selector.xml → chrome/android/java/res/drawable-ldrtl/btn_back.xml
View file @ c0198f64
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved. <!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/back_disabled" /> <item android:state_enabled="false" android:drawable="@drawable/btn_forward_disabled" />
<item android:drawable="@drawable/back" /> <item android:state_pressed="true" android:drawable="@drawable/btn_forward_pressed" />
<item android:drawable="@drawable/btn_forward_normal" />
</selector> </selector>
\ No newline at end of file
chrome/android/java/res/drawable-ldrtl/back_button_selector.xml → chrome/android/java/res/drawable-ldrtl/btn_forward.xml
View file @ c0198f64
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved. <!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/forward_disabled" /> <item android:state_enabled="false" android:drawable="@drawable/btn_back_disabled" />
<item android:drawable="@drawable/forward" /> <item android:state_pressed="true" android:drawable="@drawable/btn_back_pressed" />
<item android:drawable="@drawable/btn_back_normal" />
</selector> </selector>
\ No newline at end of file
chrome/android/java/res/drawable-ldrtl/forward_button_selector.xml → chrome/android/java/res/drawable/btn_back.xml
View file @ c0198f64
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved. <!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/back_disabled" /> <item android:state_enabled="false" android:drawable="@drawable/btn_back_disabled" />
<item android:drawable="@drawable/back" /> <item android:state_pressed="true" android:drawable="@drawable/btn_back_pressed" />
<item android:drawable="@drawable/btn_back_normal" />
</selector> </selector>
\ No newline at end of file
chrome/android/java/res/drawable/forward_button_selector.xml → chrome/android/java/res/drawable/btn_forward.xml
View file @ c0198f64
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved. <!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/forward_disabled" /> <item android:state_enabled="false" android:drawable="@drawable/btn_forward_disabled" />
<item android:drawable="@drawable/forward" /> <item android:state_pressed="true" android:drawable="@drawable/btn_forward_pressed" />
<item android:drawable="@drawable/btn_forward_normal" />
</selector> </selector>
\ No newline at end of file
chrome/android/java/res/drawable/btn_star.xml 0 → 100644
View file @ c0198f64
<?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_pressed="true" android:drawable="@drawable/btn_star_pressed" />
<item android:drawable="@drawable/btn_star_normal" />
</selector>
\ No newline at end of file
chrome/android/shell/res/menu/main_menu.xml
View file @ c0198f64
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
<menu> <menu>
<item <item
android:id="@+id/back_menu_id" android:id="@+id/back_menu_id"
android:icon="@drawable/back_button_selector" android:icon="@drawable/btn_back"
android:title="@string/accessibility_menu_back"/> android:title="@string/accessibility_menu_back"/>
<item <item
android:id="@+id/forward_menu_id" android:id="@+id/forward_menu_id"
android:icon="@drawable/forward_button_selector" android:icon="@drawable/btn_forward"
android:title="@string/accessibility_menu_forward"/> android:title="@string/accessibility_menu_forward"/>
<item <item
android:id="@+id/bookmark_this_page_id" android:id="@+id/bookmark_this_page_id"
android:icon="@drawable/star" android:icon="@drawable/btn_star"
android:title="@string/accessibility_menu_bookmark"/> android:title="@string/accessibility_menu_bookmark"/>
</menu> </menu>
</item> </item>
......
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