wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 781900 - Move site preferences dialog to urlbar context menu. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston 2012-08-20 10:28:36 -07:00
parent d4b0d1be4b
commit 9a9919e945
12 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/BrowserApp.java
View File

@ -769,9 +769,6 @@ abstract public class BrowserApp extends GeckoApp
intent = new Intent(this, GeckoPreferences.class);
startActivity(intent);
return true;
case R.id.site_settings:
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Permissions:Get", null));
return true;
case R.id.addons:
loadUrlInTab("about:addons");
return true;

4
mobile/android/base/GeckoApp.java
View File

@ -2724,6 +2724,10 @@ abstract public class GeckoApp
}
return true;
}
case R.id.site_settings: {
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Permissions:Get", null));
return true;
}
case R.id.paste: {
String text = GeckoAppShell.getClipboardText();
if (text != null && !TextUtils.isEmpty(text)) {

3
mobile/android/base/Makefile.in
View File

@ -635,7 +635,6 @@ RES_DRAWABLE_MDPI_V11 = \
res/drawable-mdpi-v11/ic_menu_back.png \
res/drawable-mdpi-v11/ic_menu_bookmark_add.png \
res/drawable-mdpi-v11/ic_menu_bookmark_remove.png \
res/drawable-mdpi-v11/ic_menu_clear_site_settings.png \
res/drawable-mdpi-v11/ic_menu_desktop_mode.png \
res/drawable-mdpi-v11/ic_menu_find_in_page.png \
res/drawable-mdpi-v11/ic_menu_forward.png \
@ -664,7 +663,6 @@ RES_DRAWABLE_HDPI_V11 = \
res/drawable-hdpi-v11/ic_menu_back.png \
res/drawable-hdpi-v11/ic_menu_bookmark_add.png \
res/drawable-hdpi-v11/ic_menu_bookmark_remove.png \
res/drawable-hdpi-v11/ic_menu_clear_site_settings.png \
res/drawable-hdpi-v11/ic_menu_desktop_mode.png \
res/drawable-hdpi-v11/ic_menu_find_in_page.png \
res/drawable-hdpi-v11/ic_menu_forward.png \
@ -693,7 +691,6 @@ RES_DRAWABLE_XHDPI_V11 = \
res/drawable-xhdpi-v11/ic_menu_back.png \
res/drawable-xhdpi-v11/ic_menu_bookmark_add.png \
res/drawable-xhdpi-v11/ic_menu_bookmark_remove.png \
res/drawable-xhdpi-v11/ic_menu_clear_site_settings.png \
res/drawable-xhdpi-v11/ic_menu_desktop_mode.png \
res/drawable-xhdpi-v11/ic_menu_find_in_page.png \
res/drawable-xhdpi-v11/ic_menu_forward.png \

BIN
mobile/android/base/resources/drawable-hdpi-v11/ic_menu_clear_site_settings.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
mobile/android/base/resources/drawable-mdpi-v11/ic_menu_clear_site_settings.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_clear_site_settings.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

4
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
View File

@ -40,10 +40,6 @@
gecko:icon="@drawable/ic_menu_desktop_mode"
gecko:title="@string/desktop_mode"
gecko:checkable="true" />
<item gecko:id="@+id/site_settings"
gecko:icon="@drawable/ic_menu_clear_site_settings"
gecko:title="@string/site_settings_title" />
<item gecko:id="@+id/addons"
gecko:title="@string/addons"/>

4
mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
View File

@ -39,10 +39,6 @@
gecko:title="@string/desktop_mode"
gecko:checkable="true" />
<item gecko:id="@+id/site_settings"
gecko:icon="@drawable/ic_menu_clear_site_settings"
gecko:title="@string/site_settings_title" />
<item gecko:id="@+id/addons"
gecko:title="@string/addons"/>

3
mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml.in
View File

@ -18,6 +18,9 @@
<item gecko:id="@+id/copyurl"
gecko:title="@string/contextmenu_copyurl"/>
<item gecko:id="@+id/site_settings"
gecko:title="@string/site_settings_title" />
<item gecko:id="@+id/add_to_launcher"
gecko:title="@string/contextmenu_add_to_launcher"/>

4
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
View File

@ -41,10 +41,6 @@
gecko:icon="@drawable/ic_menu_desktop_mode"
gecko:title="@string/desktop_mode"
gecko:checkable="true" />
<item gecko:id="@+id/site_settings"
gecko:icon="@drawable/ic_menu_clear_site_settings"
gecko:title="@string/site_settings_title" />
<item gecko:id="@+id/addons"
gecko:title="@string/addons"/>

3
mobile/android/base/resources/menu/browser_app_menu.xml.in
View File

@ -36,9 +36,6 @@
android:title="@string/desktop_mode"
android:checkable="true" />
<item android:id="@+id/site_settings"
android:title="@string/site_settings_title" />
<item android:id="@+id/addons"
android:title="@string/addons"/>

3
mobile/android/base/resources/menu/titlebar_contextmenu.xml
View File

@ -17,6 +17,9 @@
<item android:id="@+id/copyurl"
android:title="@string/contextmenu_copyurl"/>
<item android:id="@+id/site_settings"
android:title="@string/site_settings_title" />
<item android:id="@+id/add_to_launcher"
android:title="@string/contextmenu_add_to_launcher"/>