Commit Graph

1219 Commits

Author SHA1 Message Date
guojin31
4ec6ecd641 datashare整改同步5.0.1分支
Signed-off-by: guojin31 <guojin31@huawei.com>
2024-11-18 17:22:22 +08:00
guojin31
33bca8b3a9 使能输入法数据适配多用户,同步5.0.1
Signed-off-by: guojin31 <guojin31@huawei.com>
2024-11-06 09:48:16 +08:00
wangdongqi
9d33cd5936 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-11-04 11:09:29 +08:00
wangdongqi
721cb43882 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-11-02 15:59:34 +08:00
wangdongqi
f37940d6f5 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-11-01 19:44:15 +08:00
wangdongqi
5427980d39 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-31 21:10:06 +08:00
wangdongqi
a3a1101579 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-30 19:42:42 +08:00
wangdongqi
cb2e39391d Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-29 21:31:24 +08:00
wangdongqi
f0fa9b57a2 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-28 19:03:36 +08:00
wangdongqi
c375a0ef8a Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-24 17:33:16 +08:00
wangdongqi
1627af9316 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-23 21:04:34 +08:00
wangdongqi
23058ebb11 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-19 10:26:02 +08:00
openharmony_ci
f255d6f814
!1514 修复代码不一致_inputmethod_imf
Merge pull request !1514 from liwei/fix_diff
2024-10-17 03:21:32 +00:00
wangdongqi
45cec848dc Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-10-16 17:07:23 +08:00
l30031422
b433a8ab16 fix_diff
Signed-off-by: l30031422 <liwei769@huawei.com>
2024-10-12 18:07:48 +08:00
cy7717
4e851e74bf 【挑单5.0.1】ImeDied 将InputType置为false
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-09-23 10:47:06 +08:00
openharmony_ci
4e51484d15
!1469 修改crash
Merge pull request !1469 from mashaoyin/OpenHarmony-5.0-Release
2024-09-12 08:59:26 +00:00
openharmony_ci
e647a7db6b
!1466 labelId适配 5.0-release
Merge pull request !1466 from wangdongqi/OpenHarmony-5.0-Release
2024-09-11 02:02:56 +00:00
openharmony_ci
a852378aac
!1345 【5.0release】保证所有拉起流程都在停止流程彻底结束后
Merge pull request !1345 from cy7717/OpenHarmony-5.0-Release
2024-09-10 09:49:45 +00:00
ma-shaoyin
7f8d502b55 Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>
Changes to be committed:
2024-09-10 16:30:59 +08:00
cy7717
aeb4ef9371 Merge branch 'OpenHarmony-5.0-Release' of gitee.com:openharmony/inputmethod_imf into OpenHarmony-5.0-Release
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-09-09 11:54:47 +00:00
wangdongqi
f2da97f399 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-09-09 19:39:27 +08:00
zhangsaiyang
af5501fa97 服务侧快捷切换校验锁屏状态
Signed-off-by: zhangsaiyang <zhangsaiyang@huawei.com>
2024-09-09 19:17:21 +08:00
weishaoxiong
bde720d664 Merge branch 'OpenHarmony-5.0-Release' of gitee.com:openharmony/inputmethod_imf into OpenHarmony-5.0-Release
Signed-off-by: weishaoxiong <weishaoxiong2@huawei.com>
2024-09-06 11:25:09 +00:00
wuchengwen
60d847db9d add force hide
Signed-off-by: wuchengwen <wuchengwen4@huawei.com>
2024-09-06 15:25:52 +08:00
weishaoxiong
69e7b73d2e Revert "improve basic code style"
This reverts commit 86234fa817.

# Conflicts:
#	common/include/message_handler.h
#	frameworks/js/napi/inputmethodability/js_panel.cpp
#	frameworks/js/napi/inputmethodability/js_text_input_client_engine.cpp
#	frameworks/js/napi/inputmethodability/js_text_input_client_engine.h
#	frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp
#	frameworks/native/inputmethod_ability/src/input_method_ability.cpp
#	frameworks/native/inputmethod_ability/src/input_method_panel.cpp
#	frameworks/native/inputmethod_controller/include/input_attribute.h
#	frameworks/native/inputmethod_controller/include/input_client_info.h
#	frameworks/native/inputmethod_controller/src/input_method_controller.cpp
#	frameworks/native/inputmethod_controller/src/keyevent_consumer_proxy.cpp
#	frameworks/native/inputmethod_controller/src/system_cmd_channel_proxy.cpp
#	interfaces/inner_api/inputmethod_controller/include/ime_system_channel.h
#	services/adapter/settings_data_provider/include/enable_ime_data_parser.h
#	services/adapter/settings_data_provider/src/enable_ime_data_parser.cpp
#	services/adapter/settings_data_provider/src/security_mode_parser.cpp
#	services/include/ime_info_inquirer.h
#	services/include/input_method_system_ability_stub.h
#	services/src/ime_info_inquirer.cpp
#	services/src/input_method_system_ability.cpp
#	services/src/input_method_system_ability_stub.cpp
#	services/src/peruser_session.cpp
Revert "!1285refactor:代码优化"

This reverts commit dad0cd2ffc, reversing
changes made to 180ed91d5f.

# Conflicts:
#	frameworks/js/napi/inputmethodability/js_panel.cpp
#	frameworks/js/napi/inputmethodability/js_text_input_client_engine.cpp
#	frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp
#	frameworks/native/inputmethod_ability/src/input_method_ability.cpp
#	frameworks/native/inputmethod_ability/src/input_method_panel.cpp
#	frameworks/native/inputmethod_controller/src/input_method_controller.cpp
#	services/adapter/settings_data_provider/src/enable_ime_data_parser.cpp
#	services/adapter/system_language_observer/src/system_language_observer.cpp
#	services/src/im_common_event_manager.cpp
#	services/src/ime_info_inquirer.cpp
#	services/src/input_method_system_ability.cpp
#	services/src/peruser_session.cpp

Signed-off-by: weishaoxiong <weishaoxiong2@huawei.com>
2024-09-06 15:23:30 +08:00
cy7717
04b8bd520a 保证所有拉起流程都在停止流程彻底结束后
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-09-03 20:34:08 +08:00
wangdongqi
a15e34ae61 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
(cherry picked commit from <gitee.com//openharmony/inputmethod_imf/commit/18232510094f2064c2545012d8115486b8fcd249>
2024-08-30 06:37:21 +00:00
ma-shaoyin
8aa0e4003a Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>
Changes to be committed:
2024-08-27 14:49:11 +08:00
cy7717
604c3d0630 Merge branch 'OpenHarmony-5.0-Release' of gitee.com:openharmony/inputmethod_imf into OpenHarmony-5.0-Release
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-08-24 16:36:15 +00:00
shiyu-shiyu
b77a11b357 无效callingwindowId不设置
Signed-off-by: shiyu-shiyu <shiyu52@huawei.com>
2024-08-21 15:42:56 +08:00
wTong888
5ab7335e60 fix:isolated sandbox
Signed-off-by: wTong888 <wangtong94@huawei.com>
2024-08-17 17:34:11 +08:00
cy7717
9526283c90 mod for mutiluser_part3
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-08-10 21:24:03 +08:00
openharmony_ci
2d0f7c67b2
!1322 翻译回稿
Merge pull request !1322 from hemenghao/master
2024-08-01 12:40:31 +00:00
hemenghao
d2b005c22d 翻译回稿
Signed-off-by: hemenghao <hemenghao2@huawei.com>
2024-08-01 19:20:35 +08:00
openharmony_ci
f954cca221
!1329 mod for mutiluser_part2
Merge pull request !1329 from cy7717/master
2024-08-01 09:39:26 +00:00
cy7717
b2bae3fda7 mod for mutiluser
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-07-31 16:49:55 +08:00
openharmony_ci
4110038b27
!1327 mod for mutil user
Merge pull request !1327 from cy7717/master
2024-07-31 07:26:58 +00:00
cy7717
e61fc1e7c5 mod
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-07-31 11:12:34 +08:00
zhaolinglan
5dadc1f6e4 modify code
Signed-off-by: zhaolinglan <zhaolinglan1@huawei.com>
2024-07-29 14:27:46 +08:00
cy7717
051040ff0a mod for mutil user
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-07-29 11:47:34 +08:00
openharmony_ci
92209df92b
!1317 [Bug]: modify getSecurityMode
Merge pull request !1317 from 赵凌岚/master
2024-07-24 07:17:23 +00:00
openharmony_ci
0d49b5b082
!1314 tdd
Merge pull request !1314 from hemenghao/hhhh
2024-07-24 06:13:39 +00:00
zhaolinglan
323257a3af modify getsecuritymode
Signed-off-by: zhaolinglan <zhaolinglan1@huawei.com>
2024-07-24 14:11:24 +08:00
hemenghao
b6a5d7d4ea tdd
Signed-off-by: hemenghao <hemenghao2@huawei.com>
2024-07-24 12:04:00 +08:00
张琳
df3e19ae1c Merge branch 'master' of gitee.com:openharmony/inputmethod_imf into master
Signed-off-by: 张琳 <zhanglin210@huawei.com>
2024-07-23 08:31:21 +00:00
张琳
e57e772f5e
update services/src/ime_info_inquirer.cpp.
Signed-off-by: 张琳 <zhanglin210@huawei.com>
2024-07-23 08:24:49 +00:00
张琳
6580a8eb7e
update services/include/ime_info_inquirer.h.
Signed-off-by: 张琳 <zhanglin210@huawei.com>
2024-07-23 08:22:35 +00:00
openharmony_ci
3bff446030
!1312 收到包安装事件后查出的信息不全
Merge pull request !1312 from cy7717/master
2024-07-22 16:45:20 +00:00
cy7717
fdf80ac65c mod
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-07-22 23:46:33 +08:00