mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1030113 - Regression: Menu breaks on Firefox 29+ on tablets with hardware menu. r=mfinkle
This commit is contained in:
parent
0403060c91
commit
d74af04a69
@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.mozilla.gecko.preferences;
|
package org.mozilla.gecko.preferences;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
import org.mozilla.gecko.BrowserLocaleManager;
|
import org.mozilla.gecko.BrowserLocaleManager;
|
||||||
@ -27,7 +26,6 @@ import android.preference.PreferenceScreen;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuInflater;
|
import android.view.MenuInflater;
|
||||||
import android.view.ViewConfiguration;
|
|
||||||
|
|
||||||
/* A simple implementation of PreferenceFragment for large screen devices
|
/* A simple implementation of PreferenceFragment for large screen devices
|
||||||
* This will strip category headers (so that they aren't shown to the user twice)
|
* This will strip category headers (so that they aren't shown to the user twice)
|
||||||
@ -198,29 +196,4 @@ public class GeckoPreferenceFragment extends PreferenceFragment {
|
|||||||
PrefsHelper.removeObserver(mPrefsRequestId);
|
PrefsHelper.removeObserver(mPrefsRequestId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@Override
|
|
||||||
public void onAttach(Activity activity) {
|
|
||||||
super.onAttach(activity);
|
|
||||||
showOverflowMenu(activity);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Force the overflow 3-dot menu to be displayed if it isn't already displayed.
|
|
||||||
*
|
|
||||||
* This is an ugly hack for 4.0+ Android devices that don't have a dedicated menu button
|
|
||||||
* because Android does not provide a public API to display the ActionBar overflow menu.
|
|
||||||
*/
|
|
||||||
private void showOverflowMenu(Activity activity) {
|
|
||||||
try {
|
|
||||||
ViewConfiguration config = ViewConfiguration.get(activity);
|
|
||||||
Field menuOverflow = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
|
|
||||||
if (menuOverflow != null) {
|
|
||||||
menuOverflow.setAccessible(true);
|
|
||||||
menuOverflow.setBoolean(config, false);
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
Log.d(LOGTAG, "Failed to force overflow menu, ignoring.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -4,8 +4,8 @@
|
|||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
|
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:id="@+id/restore_defaults"
|
||||||
<item android:id="@+id/restore_defaults"
|
android:drawable="@drawable/menu"
|
||||||
android:title="@string/pref_search_restore_defaults" />
|
android:showAsAction="never"
|
||||||
|
android:title="@string/pref_search_restore_defaults" />
|
||||||
</menu>
|
</menu>
|
||||||
|
Loading…
Reference in New Issue
Block a user