Commit 31a85882 by Kim Jinsung

Task #38731【ABookCheck Android】(保守対応)報告入力中はデバイスの「戻る」ボタン機能を無効化

parent a4ca0597
......@@ -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,7 +1556,9 @@ public class ContentViewActivity extends ABVContentViewActivity {
if(isLinkedContent) {
goToBack();
} else {
moveToBack();
if (mOperationId == -1) { //通常PDFコンテンツのみ戻る機能有効
moveToBack();
}
}
}
return false;
......
......@@ -222,13 +222,12 @@ 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 {
finishActivity();
if (mOperationId == -1) { //通常リンクコンテンツのみ戻る機能有効
finishActivity();
}
}
}
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment