Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
31a85882
Commit
31a85882
authored
Jun 29, 2020
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Task #38731【ABookCheck Android】(保守対応)報告入力中はデバイスの「戻る」ボタン機能を無効化
parent
a4ca0597
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
+2
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
+2
-3
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
View file @
31a85882
...
...
@@ -1535,10 +1535,6 @@ public class ContentViewActivity extends ABVContentViewActivity {
public
boolean
onKeyUp
(
int
keyCode
,
KeyEvent
event
)
{
if
(
keyCode
==
KeyEvent
.
KEYCODE_BACK
)
{
Logger
.
d
(
TAG
,
"KeyEvent.KEYCODE_BACK"
);
if
(
mOperationId
!=
null
&&
mOperationId
>
-
1
)
{
putUserPref
(
AppDefType
.
UserPrefKey
.
SYNC_TARGET_OPERATION_ID
,
mOperationId
);
}
if
(
isVideoMax
)
{
videoMaxToDefault
();
}
else
if
(
isMarking
)
{
...
...
@@ -1560,9 +1556,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
if
(
isLinkedContent
)
{
goToBack
();
}
else
{
if
(
mOperationId
==
-
1
)
{
//通常PDFコンテンツのみ戻る機能有効
moveToBack
();
}
}
}
return
false
;
}
return
super
.
onKeyUp
(
keyCode
,
event
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
View file @
31a85882
...
...
@@ -222,15 +222,14 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
if
(
mXWalkOpenType
==
Constant
.
XWalkOpenType
.
PANO_EDIT
)
{
showConfirmSavePanoEdit
();
}
else
{
if
(
mOperationId
!=
null
&&
mOperationId
>
-
1
)
{
putUserPref
(
AppDefType
.
UserPrefKey
.
SYNC_TARGET_OPERATION_ID
,
mOperationId
);
}
if
(
isLinkedContent
)
{
goToBack
();
}
else
{
if
(
mOperationId
==
-
1
)
{
//通常リンクコンテンツのみ戻る機能有効
finishActivity
();
}
}
}
}
else
{
return
super
.
onKeyUp
(
keyCode
,
event
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment