mirror of
https://github.com/openharmony/miscservices_inputmethod.git
synced 2026-07-18 17:24:37 -04:00
Signed-off-by: lovechinamo <wangdongqi2@huawei.com>
Changes to be committed:
This commit is contained in:
@@ -56,7 +56,7 @@ namespace MiscServices {
|
||||
virtual bool showKeyboard(const sptr<IInputDataChannel>& inputDataChannel) = 0;
|
||||
virtual bool hideKeyboard(int32_t flags) = 0;
|
||||
virtual int32_t setKeyboardType(const KeyboardType& type) = 0;
|
||||
virtual int32_t getKeyboardWindowHeight(int32_t retHeight) = 0;
|
||||
virtual int32_t getKeyboardWindowHeight(int32_t &retHeight) = 0;
|
||||
virtual int32_t InitInputControlChannel(sptr<IInputControlChannel> &inputControlChannel) = 0;
|
||||
virtual void SetClientState(bool state) = 0;
|
||||
virtual void StopInputService(std::string imeId) = 0;
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace MiscServices {
|
||||
bool showKeyboard(const sptr<IInputDataChannel>& inputDataChannel) override;
|
||||
bool hideKeyboard(int32_t flags)override;
|
||||
int32_t setKeyboardType(const KeyboardType& type) override;
|
||||
int32_t getKeyboardWindowHeight(int32_t retHeight) override;
|
||||
int32_t getKeyboardWindowHeight(int32_t &retHeight) override;
|
||||
int32_t InitInputControlChannel(sptr<IInputControlChannel> &inputControlChannel) override;
|
||||
void SetClientState(bool state) override;
|
||||
void StopInputService(std::string imeId) override;
|
||||
|
||||
@@ -287,7 +287,7 @@ namespace MiscServices {
|
||||
msgHandler_->SendMessage(msg);
|
||||
}
|
||||
|
||||
int32_t InputMethodCoreStub::getKeyboardWindowHeight(int32_t retHeight)
|
||||
int32_t InputMethodCoreStub::getKeyboardWindowHeight(int32_t &retHeight)
|
||||
{
|
||||
IMSA_HILOGI("InputMethodCoreStub::getKeyboardWindowHeight");
|
||||
if (!msgHandler_) {
|
||||
|
||||
@@ -50,8 +50,8 @@ namespace MiscServices {
|
||||
int32_t Stop(sptr<InputClientStub> &client);
|
||||
|
||||
void displayOptionalInputMethod(MessageParcel& data) override;
|
||||
int32_t getDisplayMode(int32_t retMode) override;
|
||||
int32_t getKeyboardWindowHeight(int32_t retHeight) override;
|
||||
int32_t getDisplayMode(int32_t &retMode) override;
|
||||
int32_t getKeyboardWindowHeight(int32_t &retHeight) override;
|
||||
int32_t getCurrentKeyboardType(KeyboardType *retType) override;
|
||||
int32_t listInputMethodEnabled(std::vector<InputMethodProperty*> *properties) override;
|
||||
int32_t listInputMethod(std::vector<InputMethodProperty*> *properties) override;
|
||||
|
||||
@@ -255,7 +255,7 @@ namespace MiscServices {
|
||||
return NO_ERROR;
|
||||
}
|
||||
|
||||
int32_t InputMethodSystemAbilityProxy::getDisplayMode(int32_t retMode)
|
||||
int32_t InputMethodSystemAbilityProxy::getDisplayMode(int32_t &retMode)
|
||||
{
|
||||
MessageParcel data, reply;
|
||||
MessageOption option;
|
||||
@@ -280,7 +280,7 @@ namespace MiscServices {
|
||||
return NO_ERROR;
|
||||
}
|
||||
|
||||
int32_t InputMethodSystemAbilityProxy::getKeyboardWindowHeight(int32_t retHeight)
|
||||
int32_t InputMethodSystemAbilityProxy::getKeyboardWindowHeight(int32_t &retHeight)
|
||||
{
|
||||
MessageParcel data, reply;
|
||||
MessageOption option;
|
||||
|
||||
@@ -59,8 +59,8 @@ namespace MiscServices {
|
||||
virtual void HideCurrentInput(MessageParcel& data) = 0;
|
||||
|
||||
virtual void displayOptionalInputMethod(MessageParcel& data) = 0;
|
||||
virtual int32_t getDisplayMode(int32_t retMode) = 0;
|
||||
virtual int32_t getKeyboardWindowHeight(int32_t retHeight) = 0;
|
||||
virtual int32_t getDisplayMode(int32_t &retMode) = 0;
|
||||
virtual int32_t getKeyboardWindowHeight(int32_t &retHeight) = 0;
|
||||
virtual int32_t getCurrentKeyboardType(KeyboardType *retType) = 0;
|
||||
virtual int32_t listInputMethodEnabled(std::vector<InputMethodProperty*> *properties) = 0;
|
||||
virtual int32_t listInputMethod(std::vector<InputMethodProperty*> *properties) = 0;
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace MiscServices {
|
||||
int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
|
||||
MessageOption &option) override;
|
||||
int32_t getDisplayMode(int32_t &retMode) override;
|
||||
int32_t getKeyboardWindowHeight(int32_t retHeight) override;
|
||||
int32_t getKeyboardWindowHeight(int32_t &retHeight) override;
|
||||
int32_t getCurrentKeyboardType(KeyboardType *retType) override;
|
||||
int32_t listInputMethodEnabled(std::vector<InputMethodProperty*> *properties) override;
|
||||
int32_t listInputMethod(std::vector<InputMethodProperty*> *properties) override;
|
||||
|
||||
@@ -107,7 +107,7 @@ namespace MiscServices {
|
||||
void OnPackageRemoved(const std::u16string& packageName);
|
||||
|
||||
int GetDisplayMode();
|
||||
int GetKeyboardWindowHeight(int retHeight);
|
||||
int GetKeyboardWindowHeight(int &retHeight);
|
||||
KeyboardType *GetCurrentKeyboardType();
|
||||
|
||||
int OnSettingChanged(const std::u16string& key, const std::u16string& value);
|
||||
|
||||
@@ -309,7 +309,7 @@ namespace MiscServices {
|
||||
\return ErrorCode::NO_ERROR no error
|
||||
\return ErrorCode::ERROR_USER_NOT_UNLOCKED user not unlocked
|
||||
*/
|
||||
int32_t InputMethodSystemAbility::getKeyboardWindowHeight(int32_t retHeight)
|
||||
int32_t InputMethodSystemAbility::getKeyboardWindowHeight(int32_t &retHeight)
|
||||
{
|
||||
int32_t uid = IPCSkeleton::GetCallingUid();
|
||||
int32_t userId = getUserId(uid);
|
||||
|
||||
@@ -546,7 +546,7 @@ namespace MiscServices {
|
||||
\param[out] retHeight the height of keyboard window showing or showed returned to caller
|
||||
\return ErrorCode
|
||||
*/
|
||||
int PerUserSession::GetKeyboardWindowHeight(int retHeight)
|
||||
int PerUserSession::GetKeyboardWindowHeight(int &retHeight)
|
||||
{
|
||||
if (imsCore[lastImeIndex]) {
|
||||
int ret = imsCore[lastImeIndex]->getKeyboardWindowHeight(retHeight);
|
||||
|
||||
Reference in New Issue
Block a user