summaryrefslogtreecommitdiff
path: root/data/patches/gnuzilla-bug-1050780.patch
diff options
context:
space:
mode:
authorRuben Rodriguez <ruben@gnu.org>2015-03-08 15:14:03 +0000
committerRuben Rodriguez <ruben@gnu.org>2015-03-08 15:14:03 +0000
commit9a0fd32cf6e2ada37675bc743532c5004b16e5e3 (patch)
treed66faa3279486d2e8ad72bf70e7ef522460372a0 /data/patches/gnuzilla-bug-1050780.patch
parent2732de330618bc29b7ab07f4004d8e84f698cf95 (diff)
Added patches to fix build bugs for Windows, MacOS and Android
Diffstat (limited to 'data/patches/gnuzilla-bug-1050780.patch')
-rw-r--r--data/patches/gnuzilla-bug-1050780.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/data/patches/gnuzilla-bug-1050780.patch b/data/patches/gnuzilla-bug-1050780.patch
new file mode 100644
index 0000000..b142dc7
--- /dev/null
+++ b/data/patches/gnuzilla-bug-1050780.patch
@@ -0,0 +1,53 @@
+# HG changeset patch
+# User Lucas Rocha <lucasr@mozilla.com>
+
+Bug 1050780 - Avoid disabled items in GeckoMenu's adapter (r=margaret)
+
+diff --git a/mobile/android/base/menu/GeckoMenu.java b/mobile/android/base/menu/GeckoMenu.java
+index eff2a51..cd2404b 100644
+--- a/mobile/android/base/menu/GeckoMenu.java
++++ b/mobile/android/base/menu/GeckoMenu.java
+@@ -781,17 +781,19 @@ public class GeckoMenu extends ListView
+ public boolean areAllItemsEnabled() {
+ // Setting this to true is a workaround to fix disappearing
+ // dividers in the menu (bug 963249).
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(int position) {
+- return getItem(position).isEnabled();
++ // Setting this to true is a workaround to fix disappearing
++ // dividers in the menu in L (bug 1050780).
++ return true;
+ }
+
+ public void addMenuItem(GeckoMenuItem menuItem) {
+ if (mItems.contains(menuItem))
+ return;
+
+ // Insert it in proper order.
+ int index = 0;
+diff --git a/mobile/android/base/resources/drawable/action_bar_button.xml b/mobile/android/base/resources/drawable/action_bar_button.xml
+index 9cb7aa8..fe36bc4 100644
+--- a/mobile/android/base/resources/drawable/action_bar_button.xml
++++ b/mobile/android/base/resources/drawable/action_bar_button.xml
+@@ -1,16 +1,17 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+- <item android:state_pressed="true">
++ <item android:state_pressed="true"
++ android:state_enabled="true">
+ <shape>
+ <solid android:color="@color/highlight" />
+ </shape>
+ </item>
+
+ <item android:state_focused="true"
+ android:state_pressed="false">
+ <shape>