зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1218955 - Remove nsIMEPicker, r=jchen
This commit is contained in:
Родитель
355e3293b3
Коммит
7fad4e451f
|
@ -1070,13 +1070,6 @@ public class GeckoAppShell
|
||||||
vibrator().cancel();
|
vibrator().cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@WrapForJNI
|
|
||||||
public static void showInputMethodPicker() {
|
|
||||||
InputMethodManager imm = (InputMethodManager)
|
|
||||||
getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE);
|
|
||||||
imm.showInputMethodPicker();
|
|
||||||
}
|
|
||||||
|
|
||||||
@WrapForJNI
|
@WrapForJNI
|
||||||
public static void setKeepScreenOn(final boolean on) {
|
public static void setKeepScreenOn(final boolean on) {
|
||||||
ThreadUtils.postToUiThread(new Runnable() {
|
ThreadUtils.postToUiThread(new Runnable() {
|
||||||
|
|
|
@ -677,14 +677,6 @@ auto GeckoAppShell::ShowAlertNotificationWrapper(mozilla::jni::String::Param a0,
|
||||||
return mozilla::jni::Method<ShowAlertNotificationWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5);
|
return mozilla::jni::Method<ShowAlertNotificationWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5);
|
||||||
}
|
}
|
||||||
|
|
||||||
constexpr char GeckoAppShell::ShowInputMethodPicker_t::name[];
|
|
||||||
constexpr char GeckoAppShell::ShowInputMethodPicker_t::signature[];
|
|
||||||
|
|
||||||
auto GeckoAppShell::ShowInputMethodPicker() -> void
|
|
||||||
{
|
|
||||||
return mozilla::jni::Method<ShowInputMethodPicker_t>::Call(GeckoAppShell::Context(), nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr char GeckoAppShell::StartMonitoringGamepad_t::name[];
|
constexpr char GeckoAppShell::StartMonitoringGamepad_t::name[];
|
||||||
constexpr char GeckoAppShell::StartMonitoringGamepad_t::signature[];
|
constexpr char GeckoAppShell::StartMonitoringGamepad_t::signature[];
|
||||||
|
|
||||||
|
|
|
@ -1415,21 +1415,6 @@ public:
|
||||||
|
|
||||||
static auto ShowAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
|
static auto ShowAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
|
||||||
|
|
||||||
struct ShowInputMethodPicker_t {
|
|
||||||
typedef GeckoAppShell Owner;
|
|
||||||
typedef void ReturnType;
|
|
||||||
typedef void SetterType;
|
|
||||||
typedef mozilla::jni::Args<> Args;
|
|
||||||
static constexpr char name[] = "showInputMethodPicker";
|
|
||||||
static constexpr char signature[] =
|
|
||||||
"()V";
|
|
||||||
static const bool isStatic = true;
|
|
||||||
static const mozilla::jni::ExceptionMode exceptionMode =
|
|
||||||
mozilla::jni::ExceptionMode::ABORT;
|
|
||||||
};
|
|
||||||
|
|
||||||
static auto ShowInputMethodPicker() -> void;
|
|
||||||
|
|
||||||
struct StartMonitoringGamepad_t {
|
struct StartMonitoringGamepad_t {
|
||||||
typedef GeckoAppShell Owner;
|
typedef GeckoAppShell Owner;
|
||||||
typedef void ReturnType;
|
typedef void ReturnType;
|
||||||
|
|
|
@ -40,7 +40,6 @@ UNIFIED_SOURCES += [
|
||||||
'nsClipboard.cpp',
|
'nsClipboard.cpp',
|
||||||
'nsDeviceContextAndroid.cpp',
|
'nsDeviceContextAndroid.cpp',
|
||||||
'nsIdleServiceAndroid.cpp',
|
'nsIdleServiceAndroid.cpp',
|
||||||
'nsIMEPicker.cpp',
|
|
||||||
'nsLookAndFeel.cpp',
|
'nsLookAndFeel.cpp',
|
||||||
'nsPrintOptionsAndroid.cpp',
|
'nsPrintOptionsAndroid.cpp',
|
||||||
'nsScreenManagerAndroid.cpp',
|
'nsScreenManagerAndroid.cpp',
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
/* 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/. */
|
|
||||||
|
|
||||||
#include "nsIMEPicker.h"
|
|
||||||
#include "AndroidBridge.h"
|
|
||||||
|
|
||||||
using namespace mozilla;
|
|
||||||
|
|
||||||
NS_IMPL_ISUPPORTS(nsIMEPicker, nsIIMEPicker)
|
|
||||||
|
|
||||||
nsIMEPicker::nsIMEPicker()
|
|
||||||
{
|
|
||||||
/* member initializers and constructor code */
|
|
||||||
}
|
|
||||||
|
|
||||||
nsIMEPicker::~nsIMEPicker()
|
|
||||||
{
|
|
||||||
/* destructor code */
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP nsIMEPicker::Show()
|
|
||||||
{
|
|
||||||
widget::GeckoAppShell::ShowInputMethodPicker();
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
|
@ -1,22 +0,0 @@
|
||||||
/* 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/. */
|
|
||||||
|
|
||||||
#ifndef __nsIMEPicker
|
|
||||||
#define __nsIMEPicker
|
|
||||||
|
|
||||||
#include "nsIIMEPicker.h"
|
|
||||||
|
|
||||||
class nsIMEPicker final : public nsIIMEPicker
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
NS_DECL_ISUPPORTS
|
|
||||||
NS_DECL_NSIIMEPICKER
|
|
||||||
|
|
||||||
nsIMEPicker();
|
|
||||||
|
|
||||||
private:
|
|
||||||
~nsIMEPicker();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "nsPrintSession.h"
|
#include "nsPrintSession.h"
|
||||||
#include "nsDeviceContextAndroid.h"
|
#include "nsDeviceContextAndroid.h"
|
||||||
#include "nsHTMLFormatConverter.h"
|
#include "nsHTMLFormatConverter.h"
|
||||||
#include "nsIMEPicker.h"
|
|
||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
#include "nsAndroidProtocolHandler.h"
|
#include "nsAndroidProtocolHandler.h"
|
||||||
|
|
||||||
|
@ -38,7 +37,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsAndroid, Init)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecAndroid)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecAndroid)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIMEPicker)
|
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAndroidBridge)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAndroidBridge)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAndroidProtocolHandler)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAndroidProtocolHandler)
|
||||||
|
|
||||||
|
@ -62,7 +60,6 @@ NS_DEFINE_NAMED_CID(NS_PRINTSETTINGSSERVICE_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID);
|
NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
|
NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
|
NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_IMEPICKER_CID);
|
|
||||||
NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
|
NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_ANDROIDBRIDGE_CID);
|
NS_DEFINE_NAMED_CID(NS_ANDROIDBRIDGE_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_ANDROIDPROTOCOLHANDLER_CID);
|
NS_DEFINE_NAMED_CID(NS_ANDROIDPROTOCOLHANDLER_CID);
|
||||||
|
@ -80,7 +77,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
|
||||||
{ &kNS_PRINTSESSION_CID, false, nullptr, nsPrintSessionConstructor },
|
{ &kNS_PRINTSESSION_CID, false, nullptr, nsPrintSessionConstructor },
|
||||||
{ &kNS_DEVICE_CONTEXT_SPEC_CID, false, nullptr, nsDeviceContextSpecAndroidConstructor },
|
{ &kNS_DEVICE_CONTEXT_SPEC_CID, false, nullptr, nsDeviceContextSpecAndroidConstructor },
|
||||||
{ &kNS_HTMLFORMATCONVERTER_CID, false, nullptr, nsHTMLFormatConverterConstructor },
|
{ &kNS_HTMLFORMATCONVERTER_CID, false, nullptr, nsHTMLFormatConverterConstructor },
|
||||||
{ &kNS_IMEPICKER_CID, false, nullptr, nsIMEPickerConstructor },
|
|
||||||
{ &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
|
{ &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
|
||||||
{ &kNS_ANDROIDBRIDGE_CID, false, nullptr, nsAndroidBridgeConstructor },
|
{ &kNS_ANDROIDBRIDGE_CID, false, nullptr, nsAndroidBridgeConstructor },
|
||||||
{ &kNS_ANDROIDPROTOCOLHANDLER_CID, false, nullptr, nsAndroidProtocolHandlerConstructor },
|
{ &kNS_ANDROIDPROTOCOLHANDLER_CID, false, nullptr, nsAndroidProtocolHandlerConstructor },
|
||||||
|
@ -100,7 +96,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
|
||||||
{ "@mozilla.org/gfx/printsession;1", &kNS_PRINTSESSION_CID },
|
{ "@mozilla.org/gfx/printsession;1", &kNS_PRINTSESSION_CID },
|
||||||
{ "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
|
{ "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
|
||||||
{ "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
|
{ "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
|
||||||
{ "@mozilla.org/imepicker;1", &kNS_IMEPICKER_CID },
|
|
||||||
{ "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
|
{ "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
|
||||||
{ "@mozilla.org/android/bridge;1", &kNS_ANDROIDBRIDGE_CID },
|
{ "@mozilla.org/android/bridge;1", &kNS_ANDROIDBRIDGE_CID },
|
||||||
{ NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "android", &kNS_ANDROIDPROTOCOLHANDLER_CID },
|
{ NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "android", &kNS_ANDROIDPROTOCOLHANDLER_CID },
|
||||||
|
|
|
@ -74,7 +74,6 @@ XPIDL_SOURCES += [
|
||||||
'nsIGfxInfoDebug.idl',
|
'nsIGfxInfoDebug.idl',
|
||||||
'nsIIdleService.idl',
|
'nsIIdleService.idl',
|
||||||
'nsIIdleServiceInternal.idl',
|
'nsIIdleServiceInternal.idl',
|
||||||
'nsIIMEPicker.idl',
|
|
||||||
'nsIPrintOptions.idl',
|
'nsIPrintOptions.idl',
|
||||||
'nsIPrintSession.idl',
|
'nsIPrintSession.idl',
|
||||||
'nsIPrintSettings.idl',
|
'nsIPrintSettings.idl',
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
/* 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/. */
|
|
||||||
|
|
||||||
#include "nsISupports.idl"
|
|
||||||
|
|
||||||
[scriptable, uuid(9e631b1d-7a07-4925-a47e-697c6edaf408)]
|
|
||||||
interface nsIIMEPicker : nsISupports
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Show IME Picker dialog.
|
|
||||||
*/
|
|
||||||
void show();
|
|
||||||
};
|
|
|
@ -186,10 +186,6 @@
|
||||||
{ 0xd755a760, 0x9f27, 0x11df, \
|
{ 0xd755a760, 0x9f27, 0x11df, \
|
||||||
{ 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66, 0x42, 0x42 } }
|
{ 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66, 0x42, 0x42 } }
|
||||||
|
|
||||||
#define NS_IMEPICKER_CID \
|
|
||||||
{ 0x8e5c35ef, 0xb65b, 0x47aa, \
|
|
||||||
{ 0xbb, 0x90, 0x5b, 0x89, 0x6d, 0x88, 0x24, 0x18 } }
|
|
||||||
|
|
||||||
#define NS_WINDOWS_UIUTILS_CID \
|
#define NS_WINDOWS_UIUTILS_CID \
|
||||||
{ 0xe04a55e8, 0xfee3, 0x4ea2, \
|
{ 0xe04a55e8, 0xfee3, 0x4ea2, \
|
||||||
{ 0xa9, 0x8b, 0x41, 0xd2, 0x62, 0x1a, 0xdc, 0x3c } }
|
{ 0xa9, 0x8b, 0x41, 0xd2, 0x62, 0x1a, 0xdc, 0x3c } }
|
||||||
|
|
Загрузка…
Ссылка в новой задаче