Commit 6e040622 by Kim Jinsung

XWalk SDK削除作業

parent 1c6707e5
......@@ -38,7 +38,6 @@ app/build/
ABVJE_Launcher_Android/assets/githash.txt
ABVJE_Launcher_Android/assets/apk/
.idea/dictionaries/
/xwalk_core_library/*.iml
.idea/codeStyles/Project.xml
.idea/caches/build_file_checksums.ser
......
......@@ -343,7 +343,6 @@ public class ContentRefresher {
List<ContentDto> serverContents = json.contentVersions;
// DTO Info:contentId, metaVersion, resourceVersion, contentNameKana, readerShareFlg
int totalProgress = 0;
for (ContentDto serverContentDto : serverContents) {
while (isBusyRefreshingContent()) {
......
......@@ -136,7 +136,6 @@ public class OperationLogic extends AbstractLogic {
AcmsParameters param = new AcmsParameters(cache.getMemberInfo().sid);
OperationListJSON json = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getOperationList(param);
List<OperationDto> serverOperations = json.operationList;
//サーバーからチャットプシュデータを取得
if (ABVDataCache.getInstance().serviceOption.isChat()) {
ChatPushDataJSON chatPushJson = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getChatPushList(param);
......@@ -312,7 +311,6 @@ public class OperationLogic extends AbstractLogic {
AcmsParameters param = new AcmsParameters(cache.getMemberInfo().sid);
OperationListJSON json = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getOperationList(param);
List<OperationDto> serverOperations = json.operationList;
//サーバーからチャットプシュデータを取得
if (ABVDataCache.getInstance().serviceOption.isChat()) {
ChatPushDataJSON chatPushJson = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getChatPushList(param);
......
......@@ -162,10 +162,6 @@
android:configChanges="keyboardHidden|orientation|screenSize">
</activity>
<activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize">
</activity>
<activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.EnqueteWebViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
>
......
......@@ -5,8 +5,6 @@
android:versionCode="1"
android:versionName="1.0">
<uses-sdk tools:overrideLibrary="org.xwalk.core"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
......
......@@ -21,7 +21,6 @@ dependencies {
implementation 'com.google.guava:guava:18.0'
implementation 'com.google.zxing:core:3.2.1'
implementation 'org.jsoup:jsoup:1.9.2'
implementation project(':xwalk_core_library')
implementation project(':FoxitRDK')
}
......@@ -42,7 +41,7 @@ android {
res.srcDirs = ['res']
jniLibs.srcDirs = ['libs', 'xwalk_core_library/src/main/jniLibs']
jniLibs.srcDirs = ['libs']
}
}
lintOptions {
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/frameTopbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/app_color"
android:minHeight="50dp" >
<ImageButton
android:id="@+id/closeBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:background="@drawable/btn_close"
android:visibility="visible"
android:contentDescription="@string/cont_desc" />
<ImageButton
android:id="@+id/btn_link_original_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/closeBtn"
android:background="@drawable/btn_before_back"
android:visibility="gone"
android:contentDescription="@string/cont_desc" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<TextView
android:id="@+id/title"
style="@style/DialogToolBarTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/text_dialog"
android:gravity="center"
android:textStyle="bold" />
</LinearLayout>
<ImageButton
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:visibility="gone"
android:background="@drawable/ic_operation_home"
android:contentDescription="@string/cont_desc" />
<ImageButton
android:id="@+id/btn_remote_pause"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:background="@drawable/btn_remote_pause"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_remote_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:background="@drawable/btn_remote_start"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_history_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:layout_toRightOf="@+id/closeBtn"
android:background="@drawable/btn_history_list" />
<LinearLayout
android:id="@+id/historyLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/menuLayout"
android:layout_marginRight="10dp" >
<ImageButton
android:id="@+id/btnWebBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:background="@drawable/btn_history_back"
android:contentDescription="@string/cont_desc" />
<ImageButton
android:id="@+id/btnWebForward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_history_forward"
android:contentDescription="@string/cont_desc" />
</LinearLayout>
<LinearLayout
android:id="@+id/menuLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp" >
<ImageButton
android:id="@+id/btn_reload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/btn_reload"
android:contentDescription="@string/list"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/btn_download"
android:contentDescription="@string/list"
android:visibility="gone" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp" >
<ImageButton
android:id="@+id/btn_sub_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/list"
android:background="@drawable/btn_view_sub_menu" />
</RelativeLayout>
<ImageButton
android:id="@+id/btn_promote"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/btn_promote"
android:contentDescription="@string/list"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_exitMeeting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_exit"
android:contentDescription="@string/list"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_add_scene"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_operation_add_scene"
android:layout_marginRight="10dp"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_show_task_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_operation_task_list"
android:layout_marginRight="10dp"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/xWalkLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="0dp" />
<ProgressBar
android:id="@+id/refresh_prog"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:visibility="gone" />
<ImageButton
android:id="@+id/btnWebClose"
android:layout_width="70dp"
android:layout_height="15dp"
android:layout_gravity="center|top"
android:background="@drawable/btn_webview_close"
android:contentDescription="@string/cont_desc" />
<TextView
android:id="@+id/txt_meeting_participant"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:background="@drawable/frame"
android:padding="8dp"
android:layout_gravity="right|top"
android:text=""
android:textSize="15sp"
android:visibility="gone"
android:maxLines="1" />
</FrameLayout>
</LinearLayout>
\ No newline at end of file
package jp.agentec.abook.abv.cl.util;
import android.app.Activity;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGatt;
......@@ -25,7 +26,6 @@ import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.adf.util.StringUtil;
import static android.bluetooth.BluetoothDevice.TRANSPORT_LE;
import static org.chromium.base.ThreadUtils.runOnUiThread;
public class BleManagerUtil {
private final String TAG = "BleManagerUtil";
......@@ -78,7 +78,7 @@ public class BleManagerUtil {
// }, 1500);
// }
// }
runOnUiThread( new Runnable() {
((Activity)mContext).runOnUiThread( new Runnable() {
@Override
public void run() {
if (mListener != null) {
......@@ -108,7 +108,7 @@ public class BleManagerUtil {
isGattaNull = true;
}
if (isGattaNull || isNotDiscoverService) {
runOnUiThread( new Runnable() { // 接続失敗
((Activity)mContext).runOnUiThread( new Runnable() { // 接続失敗
@Override
public void run() {
if (mListener != null) {
......@@ -202,7 +202,7 @@ public class BleManagerUtil {
@Override
public void onScanResult(int callbackType, final ScanResult result) {
super.onScanResult(callbackType, result);
runOnUiThread(new Runnable() {
((Activity)mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
BluetoothDevice device = result.getDevice();
......@@ -220,7 +220,7 @@ public class BleManagerUtil {
public void onScanFailed(final int errorCode) {
super.onScanFailed(errorCode);
Logger.e(TAG, "scan failed errorCode : " + errorCode);
runOnUiThread( new Runnable() {
((Activity)mContext).runOnUiThread( new Runnable() {
@Override
public void run() {
if (mListener != null) {
......
......@@ -84,7 +84,6 @@ import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
import jp.agentec.abook.abv.ui.home.helper.ABookPermissionHelper;
import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
import jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.NoPdfViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.PhotoEditActivity;
import jp.agentec.abook.abv.ui.viewer.foxitPdf.FoxitPdfCore;
......@@ -1040,9 +1039,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} else {
ActivityHandlingHelper.getInstance().startContentActivity(contentInfo[0], (int) contentInfo[1]);
}
if (this instanceof HTMLXWalkWebViewActivity) {
return;
}
getReturnContentIdList().remove(listSize - 1);
}
}
......
......@@ -93,7 +93,6 @@ import jp.agentec.abook.abv.ui.viewer.activity.CommunicationWebViewActivity;
import jp.agentec.adf.util.StringUtil;
import static jp.agentec.abook.abv.bl.common.constant.ABookCommConstants.DEFAULT_CHECKSUM;
import static org.chromium.net.NetError.ERR_FAILED;
/**
* Created by AIS-NB-048 on 2019/07/31.
......@@ -666,7 +665,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
public void onReceivedError(WebView view, int errorCode,
String description, String failingUrl) {
if (errorCode == ERR_FAILED) {
if (errorCode == ERROR_HOST_LOOKUP) {
mChatWebView.removeView(view);
view.removeAllViews();
mChatWebView.reload();
......
......@@ -1751,11 +1751,7 @@ public class GuideViewActivity extends ABVContentViewActivity {
boolean innerBrowser = (browserType == null) || browserType.equals("0");
if (innerBrowser) {
if (linkurl.toLowerCase().contains(AppDefType.UrlPattern.smart360)) {
ActivityHandlingHelper.getInstance().startHTMLXWalkWebActivity(this, null, linkurl, getContentId(), WEBVIEW, pageNumber, objectId, objectLogId, readingLogId);
} else {
ActivityHandlingHelper.getInstance().startHTMLWebActivity(this, null, linkurl, getContentId(), WEBVIEW, pageNumber, objectId, objectLogId, readingLogId);
}
ActivityHandlingHelper.getInstance().startHTMLWebActivity(this, null, linkurl, getContentId(), WEBVIEW, pageNumber, objectId, objectLogId, readingLogId);
}
else {
Intent i = new Intent(Intent.ACTION_VIEW);
......
......@@ -7,8 +7,6 @@ import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
......@@ -30,12 +28,9 @@ import android.widget.Toast;
import com.handmark.pulltorefresh.library.PullToRefreshBase;
import net.lingala.zip4j.exception.ZipException;
import org.json.adf.JSONObject;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
......@@ -45,9 +40,6 @@ import java.util.List;
import java.util.Map;
import java.util.Stack;
import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
import jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetOperationDataParameters;
import jp.agentec.abook.abv.bl.acms.type.AcmsApis;
import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType;
import jp.agentec.abook.abv.bl.acms.type.OperationType;
......@@ -56,32 +48,17 @@ import jp.agentec.abook.abv.bl.common.Callback;
import jp.agentec.abook.abv.bl.common.CommonExecutor;
import jp.agentec.abook.abv.bl.common.Constant;
import jp.agentec.abook.abv.bl.common.Constant.ReportType;
import jp.agentec.abook.abv.bl.common.Constant.TaskReportLevel;
import jp.agentec.abook.abv.bl.common.constant.ABookCommConstants;
import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
import jp.agentec.abook.abv.bl.common.exception.ABVException;
import jp.agentec.abook.abv.bl.common.exception.ABVExceptionCode;
import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.data.ABVDataCache;
import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
import jp.agentec.abook.abv.bl.data.dao.OperationContentDao;
import jp.agentec.abook.abv.bl.data.dao.OperationDao;
import jp.agentec.abook.abv.bl.data.dao.TaskDao;
import jp.agentec.abook.abv.bl.data.dao.TaskReportDao;
import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.OperationContentDto;
import jp.agentec.abook.abv.bl.dto.OperationDto;
import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
import jp.agentec.abook.abv.bl.dto.TaskDto;
import jp.agentec.abook.abv.bl.dto.TaskReportDto;
import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.OperationGroupMasterLogic;
import jp.agentec.abook.abv.bl.logic.OperationLogic;
import jp.agentec.abook.abv.bl.logic.PushMessageLogic;
import jp.agentec.abook.abv.cl.util.PreferenceUtil;
import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.activity.ABVUIActivity;
......@@ -104,7 +81,6 @@ import jp.agentec.abook.abv.ui.home.helper.HomeOperationListHelper;
import jp.agentec.abook.abv.ui.home.helper.OperationGroupMasterListHelper;
import jp.agentec.abook.abv.ui.home.helper.OperationListHelper;
import jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.OnlineHTMLWebViewActivity;
import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil;
......@@ -970,8 +946,7 @@ public class OperationListActivity extends ABVUIActivity {
intent.putExtra("LINKURL", "file://" + path);
ActivityHandlingHelper.getInstance().checkContentActivity(operationDto.contentId, 0, intent);
} else {
intent.setClass(OperationListActivity.this, HTMLXWalkWebViewActivity.class);
ActivityHandlingHelper.getInstance().startHTMLXWalkWebActivity(OperationListActivity.this, intent, "file://" + path, operationDto.contentId, -1, -1, -1, -1, -1);
ActivityHandlingHelper.getInstance().startHTMLWebActivity(OperationListActivity.this, intent, "file://" + path, operationDto.contentId, -1, -1, -1, -1, -1);
}
}
});
......@@ -1073,8 +1048,7 @@ public class OperationListActivity extends ABVUIActivity {
intent.putExtra(Constant.ABookCheck.XWALK_OPEN_TYPE, Constant.XWalkOpenType.PANO_EDIT);
intent.putExtra(AppDefType.ChatPushMessageKey.baseActivityName, OperationListActivity.class.getName());
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(OperationListActivity.this, HTMLXWalkWebViewActivity.class);
ActivityHandlingHelper.getInstance().startHTMLXWalkWebActivity(OperationListActivity.this, intent, url, operationDto.contentId, -1, -1, -1, -1, -1);
ActivityHandlingHelper.getInstance().startHTMLWebActivity(OperationListActivity.this, intent, url, operationDto.contentId, -1, -1, -1, -1, -1);
} catch (Exception e) {
Logger.e(TAG, e);
ErrorMessage.showErrorMessageToast(getApplicationContext(), ErrorCode.E107);
......
......@@ -23,7 +23,6 @@ import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
import jp.agentec.abook.abv.ui.home.activity.OperationListActivity;
import jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
......@@ -111,7 +110,6 @@ public class ABookPermissionHelper {
if (ContextCompat.checkSelfPermission(mContext, android.Manifest.permission.READ_EXTERNAL_STORAGE) != PERMISSION_GRANTED ||
ContextCompat.checkSelfPermission(mContext, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
if (mContext instanceof HTMLWebViewActivity ||
mContext instanceof HTMLXWalkWebViewActivity ||
mContext instanceof OperationListActivity ||
mContext instanceof DeviceImageListActivity) {
// リソースパターンの適用
......
......@@ -80,7 +80,6 @@ import jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.ContentViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.EnqueteWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.ImageViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity;
......@@ -316,7 +315,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
} else if (contentType.equals(ContentJSON.KEY_HTML_TYPE)) { // HTMLファイル
startHTMLWebActivity(context, intent, "file://" + path, contentId, -1, -1, -1, -1, -1);
} else if (StringUtil.equalsAny(contentType, ContentJSON.KEY_PANO_MOVIE_TYPE, ContentJSON.KEY_PANO_IMAGE_TYPE, ContentJSON.KEY_OBJECTVR_TYPE)) { // HTML/360動画/バーチャルツアー/オブジェクトVR
startHTMLXWalkWebActivity(context, intent, "file://" + path, contentId, -1, -1, -1, -1, -1);
startHTMLWebActivity(context, intent, "file://" + path, contentId, -1, -1, -1, -1, -1);
} else if (contentType.equals(ContentJSON.KEY_ENQUETE_TYPE)
|| contentType.equals(ContentJSON.KEY_EXAM_TYPE)) { // ENQUETE, EXAMファイル
//会議室連動はしない
......@@ -333,11 +332,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
// 内部ブラウザ
DownloadedContentInfoJSON json = ContentFileUtil.getDownloadedContentInfoJSON(contentId);
if (json.browserType == 0) {
if (path.toLowerCase().contains(AppDefType.UrlPattern.smart360)) {
startHTMLXWalkWebActivity(context, intent, path, contentId, -1, -1, -1, -1, -1);
} else {
startHTMLWebActivity(context, intent, path, contentId, -1, -1, -1, -1, -1);
}
startHTMLWebActivity(context, intent, path, contentId, -1, -1, -1, -1, -1);
// 外部ブラウザ
} else {
Uri uri = Uri.parse(path);
......@@ -476,46 +471,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
}
/**
* XWalkWebViewを開く
*
* @param context
* @param intent
* @param path
* @param contentId
* @param requestCode
* @param pageNumber 呼び出し元のページ番号
* @param objectId
*/
public void startHTMLXWalkWebActivity(Context context, Intent intent, String path, long contentId, int requestCode, int pageNumber, long objectId, int objectLogId, int readingLogId) {
if (path != null && path.startsWith("http") && !ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
ABVToastUtil.showMakeText(context, R.string.NETWORK, Toast.LENGTH_LONG);
return;
}
if (intent == null) {
intent = new Intent();
}
//Android7.0以上の場合、CrossWalk表示できない為、通常のWebView利用
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
intent.setClass(context, HTMLXWalkWebViewActivity.class);
} else {
intent.setClass(context, HTMLWebViewActivity.class);
}
intent.putExtra("LINKURL", path);
intent.putExtra(ABookKeys.CONTENT_ID, contentId);
intent.putExtra("pageNumber", pageNumber);
intent.putExtra("objectId", objectId);
intent.putExtra("objectLogId", objectLogId);
intent.putExtra("readingLogId", readingLogId);
if (requestCode == -1) {
context.startActivity(intent);
} else {
((Activity) context).startActivityForResult(intent, requestCode);
}
}
/**
* WebViewを開く
*
* @param context
......@@ -798,7 +753,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
if (!currentActivityStack.isEmpty() && currentActivityStack.size() > 1) {
// 直前のコンテンツを取り出す
ABVAuthenticatedActivity activity = currentActivityStack.get(currentActivityStack.size() - 2);
if (!(activity instanceof HTMLWebViewActivity || activity instanceof HTMLXWalkWebViewActivity)) {
if (!(activity instanceof HTMLWebViewActivity)) {
return false;
}
......@@ -807,11 +762,6 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
if (htmlWebViewActivity.getContentId() == contentId) {
return true;
}
} else {
HTMLXWalkWebViewActivity htmlXWalkWebViewActivity = (HTMLXWalkWebViewActivity) activity;
if (htmlXWalkWebViewActivity.getContentId() == contentId) {
return true;
}
}
}
return false;
......
......@@ -3830,13 +3830,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
isAnotherViewOpenFlg = true;
preViewFlg = true;
boolean innerBrowser = (browserType == null) || browserType.equals("0");
if (innerBrowser) {
if (linkurl.toLowerCase().contains(AppDefType.UrlPattern.smart360)) {
ActivityHandlingHelper.getInstance().startHTMLXWalkWebActivity(this, null, linkurl, getContentId(), WEBVIEW, pageNumber, objectId, objectLogId, readingLogId);
} else {
ActivityHandlingHelper.getInstance().startHTMLWebActivity(this, null, linkurl, getContentId(), WEBVIEW, pageNumber, objectId, objectLogId, readingLogId);
}
ActivityHandlingHelper.getInstance().startHTMLWebActivity(this, null, linkurl, getContentId(), WEBVIEW, pageNumber, objectId, objectLogId, readingLogId);
} else {
Intent i = new Intent(Intent.ACTION_VIEW);
if (StringUtil.isNullOrEmpty(linkurl)) {
......
......@@ -40,8 +40,6 @@ import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.ContentViewActivity;
import jp.agentec.adf.util.StringUtil;
import static org.chromium.base.ThreadUtils.runOnUiThread;
/**
* Created by seo-y on 2018/11/14.
*/
......@@ -334,7 +332,7 @@ public class OperationTaskLayout extends RelativeLayout {
setLayoutParams(params);
runOnUiThread(new Runnable() {
mContext.runOnUiThread(new Runnable() {
@Override
public void run() {
mWebView.loadUrl(script);
......@@ -354,7 +352,7 @@ public class OperationTaskLayout extends RelativeLayout {
script = String.format(SCRIPT_BEFORE_SHOW_TASK_REPORT, operationTaskDto.taskKey.equals(TEMP_TASK_KEY) ? "" : operationTaskDto.taskKey);
runOnUiThread(new Runnable() {
mContext.runOnUiThread(new Runnable() {
@Override
public void run() {
mWebView.loadUrl(script);
......
......@@ -38,8 +38,8 @@ app_versioncode=1
# abvEnvironments.xml
#cms server
acms_address=https://chatdev2.agentec.jp/acms
download_server_address=https://chatdev2.agentec.jp/acms
acms_address=https://check.abookcloud.com/acms
download_server_address=https://check.abookcloud.com/acms
#syncview server
websocket_server_http_url=https://check130.agentec.jp/v1
......@@ -93,7 +93,7 @@ hope_page=http://www.agentec.jp
contact_email=abook-appsupport@agentec.jp
#Log Settings
log_level=2
log_level=0
default_log_name=abvje
#エラーレポート/Exportログ送信方法 1:acms 2:平文メール(開発・テスト時のみ) 3:暗号化添付メール
error_report_flg=1
......
include ':ABVJE_BL', ':ABVJE_Launcher_Android', ':ABVJE_Res_Default_Android', ':ABVJE_UI_Android'
include ':xwalk_core_library'
include ':FoxitRDK'
\ No newline at end of file
apply plugin: 'com.android.library'
android {
compileSdkVersion 31
defaultConfig {
minSdkVersion 23
targetSdkVersion 31
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
lintOptions {
abortOnError false
}
}
dependencies {
api files('libs/xwalk_core_library.jar')
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xwalk.core"
android:versionCode="1"
android:versionName="1.0" >
</manifest>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask"
android:drawable="@drawable/button_compat_shape" />
</ripple>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:drawable="@drawable/button_compat_shape" />
</ripple>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetBottom="@dimen/keyboard_accessory_padding"
android:insetLeft="@dimen/keyboard_accessory_half_padding"
android:insetRight="@dimen/keyboard_accessory_half_padding"
android:insetTop="@dimen/keyboard_accessory_padding">
<shape>
<solid android:color="#ECEFF1" />
<corners android:radius="2dp" />
</shape>
</inset>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#fff" />
<corners android:radius="2dp" />
</shape>
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
android:left="0dp">
<shape android:shape="rectangle">
<solid android:color="@color/color_picker_border_color"/>
</shape>
</item>
<item android:top="0px"
android:right="1px"
android:bottom="0px"
android:left="1px">
<shape android:shape="rectangle">
<solid android:color="@color/color_picker_background_color"/>
</shape>
</item>
<item
android:id="@+id/color_button_swatch"
android:top="1px"
android:right="2px"
android:bottom="1px"
android:left="2px">
<shape android:shape="rectangle">
<solid android:color="#FF0000"/>
</shape>
</item>
</layer-list>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1px" android:color="@color/color_picker_border_color" />
<solid android:color="@color/color_picker_background_color"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="#333" />
<item android:state_enabled="false" android:color="#888" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_above_anchor="true"
android:drawable="@drawable/dropdown_popup_background_up" />
<item android:drawable="@drawable/dropdown_popup_background_down" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<!-- ScrollView is needed since sometimes the dialog does not fit in small screen devices. -->
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:gravity="center">
<DatePicker
android:id="@+id/date_picker"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnersShown="true"
android:calendarViewShown="false"
android:datePickerMode="spinner"
android:contentDescription="@string/accessibility_datetime_picker_date"
/>
<TimePicker
android:id="@+id/time_picker"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:timePickerMode="spinner"
android:contentDescription="@string/accessibility_datetime_picker_time"
/>
</LinearLayout>
</HorizontalScrollView>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="@dimen/keyboard_accessory_height"
android:layout_width="wrap_content"
android:background="@drawable/autofill_chip_inset"
android:paddingEnd="@dimen/keyboard_accessory_padding"
android:paddingStart="@dimen/keyboard_accessory_padding">
<TextView
android:id="@+id/autofill_keyboard_accessory_item_label"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:drawablePadding="@dimen/keyboard_accessory_half_padding"
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:minWidth="@dimen/keyboard_accessory_chip_height"
android:paddingEnd="@dimen/keyboard_accessory_half_padding"
android:paddingStart="@dimen/keyboard_accessory_half_padding"
android:singleLine="true"
android:textColor="#333"
android:textSize="@dimen/keyboard_accessory_text_size" />
<TextView
android:id="@+id/autofill_keyboard_accessory_item_sublabel"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingEnd="@dimen/keyboard_accessory_half_padding"
android:singleLine="true"
android:textColor="#646464"
android:textSize="@dimen/keyboard_accessory_text_size"
android:visibility="gone" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/color_picker_gradient_margin"
android:layout_marginEnd="@dimen/color_picker_gradient_margin"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textIsSelectable="false" />
<FrameLayout
android:id="@+id/gradient_border"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_below="@id/text"
android:layout_marginStart="@dimen/color_picker_gradient_margin"
android:layout_marginEnd="@dimen/color_picker_gradient_margin"
android:layout_marginTop="3dp"
android:background="@drawable/color_picker_border"
android:padding="1dp" >
<View
android:id="@+id/gradient"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<SeekBar
android:id="@+id/seek_bar"
android:layout_width="match_parent"
android:layout_height="75dp"
android:layout_below="@id/text"
android:progressDrawable="@android:color/transparent"
android:thumb="@drawable/color_picker_advanced_select_handle"
android:translationY="25dp" />
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="15dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.chromium.ui.ColorPickerAdvanced
android:id="@+id/color_picker_advanced"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</ScrollView>
<org.chromium.ui.ColorPickerSimple
android:id="@+id/color_picker_simple"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@color/color_picker_border_color"
android:dividerHeight="1px"
android:paddingStart="1px"
android:paddingEnd="1px"
android:paddingTop="1px"
android:background="@drawable/color_picker_border" />
<FrameLayout
android:id="@+id/more_colors_button_border"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/color_picker_border"
android:padding="1px">
<org.chromium.ui.ColorPickerMoreButton
android:id="@+id/more_colors_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/color_picker_button_more" />
</FrameLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:paddingTop="15dp" >
<TextView
android:id="@+id/title"
style="?android:attr/textAppearanceLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/selected_color_view_border"
android:layout_centerVertical="true"
android:textColor="#33B5E5"
android:ellipsize="end"
android:singleLine="true" />
<FrameLayout
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:id="@+id/selected_color_view_border"
android:background="@drawable/color_picker_border"
android:padding="2dp">
<View
android:id="@+id/selected_color_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black" />
</FrameLayout>
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/date_time_suggestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="44dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:id="@+id/date_time_suggestion_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:singleLine="true"
android:textSize="18sp" />
<TextView
android:id="@+id/date_time_suggestion_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:textSize="18sp"
android:gravity="end"
android:textColor="#8b8b8b"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<!-- These layout params are overwritten in DropdownAdapter.java -->
<LinearLayout
android:id="@+id/dropdown_label_wrapper"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical" >
<TextView
android:id="@+id/dropdown_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:ellipsize="end"
android:includeFontPadding="false"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="@drawable/dropdown_label_color"
android:textSize="18sp" />
<TextView
android:id="@+id/dropdown_sublabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:ellipsize="end"
android:includeFontPadding="false"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="#646464"
android:textSize="14sp" />
</LinearLayout>
<ImageView
android:id="@+id/dropdown_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:contentDescription="@null" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:gravity="start">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/time_picker_dialog_title"
android:textSize="20sp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:gravity="start"
android:textColor="#33B5E5"
/>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:background="#33B5E5"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:gravity="center">
<NumberPicker
android:id="@+id/hour"
android:layout_width="0dp"
android:layout_weight=".2"
android:textSize="12sp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:contentDescription="@string/accessibility_time_picker_hour"
/>
<TextView
android:layout_width="wrap_content"
android:textSize="12sp"
android:layout_height="wrap_content"
android:text="@string/time_picker_dialog_hour_minute_separator"
/>
<NumberPicker
android:id="@+id/minute"
android:layout_width="0dp"
android:layout_weight=".2"
android:textSize="12sp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:contentDescription="@string/accessibility_time_picker_minute"
/>
<TextView
android:id="@+id/second_colon"
android:layout_width="wrap_content"
android:textSize="12sp"
android:layout_height="wrap_content"
android:text="@string/time_picker_dialog_minute_second_separator" />
<NumberPicker
android:id="@+id/second"
android:layout_width="0dp"
android:layout_weight=".2"
android:textSize="12sp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:contentDescription="@string/accessibility_time_picker_second"
/>
<TextView
android:id="@+id/second_dot"
android:layout_width="wrap_content"
android:textSize="12sp"
android:layout_height="wrap_content"
android:text="@string/time_picker_dialog_second_subsecond_separator"
/>
<NumberPicker
android:id="@+id/milli"
android:layout_width="0dp"
android:layout_weight=".2"
android:textSize="12sp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:contentDescription="@string/accessibility_time_picker_milli"
/>
<NumberPicker
android:id="@+id/ampm"
android:layout_width="0dp"
android:layout_weight=".2"
android:textSize="12sp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:contentDescription="@string/accessibility_time_picker_ampm"
/>
</LinearLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pickers"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="horizontal" >
<!-- Position in year -->
<NumberPicker
android:id="@+id/position_in_year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/accessibility_date_picker_month"
android:focusable="true"
android:focusableInTouchMode="true" />
<!-- Year -->
<NumberPicker
android:id="@+id/year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/accessibility_date_picker_year"
android:focusable="true"
android:focusableInTouchMode="true" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bubble">
<LinearLayout
android:id="@+id/top_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/icon_view"
android:layout_alignEnd="@+id/text_wrapper"
android:weightSum="1">
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="0.25"
android:visibility="invisible"/>
<ImageView
android:id="@+id/arrow_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="7dp"
android:src="@drawable/bubble_arrow_up"
android:contentDescription="@null" />
</LinearLayout>
<ImageView
android:id="@id/icon_view"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_alignParentStart="true"
android:layout_below="@id/top_view"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_warning"
android:contentDescription="@null" />
<LinearLayout
android:id="@id/text_wrapper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/top_view"
android:layout_toEndOf="@id/icon_view"
android:orientation="vertical">
<TextView
android:id="@+id/main_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="300dp"
android:textColor="@android:color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/sub_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="300dp"
android:textColor="#444"
android:textSize="13sp" />
</LinearLayout>
</RelativeLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="@dimen/keyboard_accessory_height"
android:layout_width="40dp"
android:background="@drawable/autofill_chip_inset"
android:padding="12dp"
tools:ignore="contentDescription" />
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<LinearLayout android:background="@drawable/autofill_chip_inset" android:layout_height="@dimen/keyboard_accessory_height" android:layout_width="wrap_content" android:paddingLeft="@dimen/keyboard_accessory_padding" android:paddingRight="@dimen/keyboard_accessory_padding" xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:drawablePadding="@dimen/keyboard_accessory_half_padding" android:ellipsize="end" android:fontFamily="sans-serif-medium" android:gravity="center_vertical" android:id="@+id/autofill_keyboard_accessory_item_label" android:layout_height="match_parent" android:layout_width="wrap_content" android:minWidth="@dimen/keyboard_accessory_chip_height" android:paddingLeft="@dimen/keyboard_accessory_half_padding" android:paddingRight="@dimen/keyboard_accessory_half_padding" android:singleLine="true" android:textColor="#333" android:textSize="@dimen/keyboard_accessory_text_size"/>
<TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/autofill_keyboard_accessory_item_sublabel" android:layout_height="match_parent" android:layout_width="wrap_content" android:paddingRight="@dimen/keyboard_accessory_half_padding" android:singleLine="true" android:textColor="#646464" android:textSize="@dimen/keyboard_accessory_text_size" android:visibility="gone"/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<RelativeLayout android:layout_height="wrap_content" android:layout_width="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/text" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/color_picker_gradient_margin" android:layout_marginRight="@dimen/color_picker_gradient_margin" android:layout_width="match_parent" android:textAppearance="@android:style/TextAppearance.Medium" android:textIsSelectable="false"/>
<FrameLayout android:background="@drawable/color_picker_border" android:id="@+id/gradient_border" android:layout_below="@id/text" android:layout_height="50dp" android:layout_marginLeft="@dimen/color_picker_gradient_margin" android:layout_marginRight="@dimen/color_picker_gradient_margin" android:layout_marginTop="3dp" android:layout_width="match_parent" android:padding="1dp">
<View android:id="@+id/gradient" android:layout_height="match_parent" android:layout_width="match_parent"/>
</FrameLayout>
<SeekBar android:id="@+id/seek_bar" android:layout_below="@id/text" android:layout_height="75dp" android:layout_width="match_parent" android:progressDrawable="@android:color/transparent" android:thumb="@drawable/color_picker_advanced_select_handle" android:translationY="25dp"/>
</RelativeLayout>
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" android:padding="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
<ScrollView android:layout_height="wrap_content" android:layout_width="match_parent">
<org.chromium.ui.ColorPickerAdvanced android:id="@+id/color_picker_advanced" android:layout_height="wrap_content" android:layout_width="match_parent"/>
</ScrollView>
<org.chromium.ui.ColorPickerSimple android:background="@drawable/color_picker_border" android:divider="@color/color_picker_border_color" android:dividerHeight="1px" android:id="@+id/color_picker_simple" android:layout_height="wrap_content" android:layout_width="match_parent" android:paddingLeft="1px" android:paddingRight="1px" android:paddingTop="1px"/>
<FrameLayout android:background="@drawable/color_picker_border" android:id="@+id/more_colors_button_border" android:layout_height="wrap_content" android:layout_width="match_parent" android:padding="1px">
<org.chromium.ui.ColorPickerMoreButton android:id="@+id/more_colors_button" android:layout_height="wrap_content" android:layout_width="match_parent" android:minHeight="48dp" android:text="@string/color_picker_button_more" android:textAppearance="?android:attr/textAppearanceSmall" style="?android:attr/buttonBarButtonStyle"/>
</FrameLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<RelativeLayout android:layout_height="wrap_content" android:layout_width="match_parent" android:paddingBottom="15dp" android:paddingLeft="20dp" android:paddingRight="20dp" android:paddingTop="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:ellipsize="end" android:id="@+id/title" android:layout_centerVertical="true" android:layout_height="wrap_content" android:layout_toLeftOf="@+id/selected_color_view_border" android:layout_width="match_parent" android:singleLine="true" android:textColor="#33B5E5" style="?android:attr/textAppearanceLarge"/>
<FrameLayout android:background="@drawable/color_picker_border" android:id="@+id/selected_color_view_border" android:layout_alignParentRight="true" android:layout_height="40dp" android:layout_width="40dp" android:padding="2dp">
<View android:background="@android:color/black" android:id="@+id/selected_color_view" android:layout_height="match_parent" android:layout_width="match_parent"/>
</FrameLayout>
</RelativeLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2012 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<!-- ScrollView is needed since sometimes the dialog does not fit in small screen devices. -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:gravity="center">
<DatePicker
android:id="@+id/date_picker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnersShown="true"
android:calendarViewShown="false"
android:datePickerMode="spinner"
android:contentDescription="@string/accessibility_datetime_picker_date"
/>
<TimePicker
android:id="@+id/time_picker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:timePickerMode="spinner"
android:contentDescription="@string/accessibility_datetime_picker_time"
/>
</LinearLayout>
</ScrollView>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout android:gravity="center_vertical" android:id="@+id/date_time_suggestion" android:layout_height="wrap_content" android:layout_width="match_parent" android:minHeight="44dp" android:orientation="horizontal" xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:ellipsize="end" android:id="@+id/date_time_suggestion_value" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_width="wrap_content" android:singleLine="true" android:textSize="18sp"/>
<TextView android:ellipsize="end" android:gravity="end" android:id="@+id/date_time_suggestion_label" android:layout_height="wrap_content" android:layout_marginRight="10dp" android:layout_weight="1" android:layout_width="0dp" android:singleLine="true" android:textColor="#8b8b8b" android:textSize="18sp"/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout android:gravity="center_vertical" android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="horizontal" xmlns:android="http://schemas.android.com/apk/res/android">
<!-- These layout params are overwritten in DropdownAdapter.java -->
<LinearLayout android:gravity="center_vertical" android:id="@+id/dropdown_label_wrapper" android:layout_height="0dp" android:layout_weight="1" android:layout_width="0dp" android:orientation="vertical">
<TextView android:ellipsize="end" android:id="@+id/dropdown_label" android:includeFontPadding="false" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_width="wrap_content" android:singleLine="true" android:textAlignment="viewStart" android:textColor="@drawable/dropdown_label_color" android:textSize="18sp"/>
<TextView android:ellipsize="end" android:id="@+id/dropdown_sublabel" android:includeFontPadding="false" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_width="wrap_content" android:singleLine="true" android:textAlignment="viewStart" android:textColor="#646464" android:textSize="14sp"/>
</LinearLayout>
<ImageView android:contentDescription="@null" android:id="@+id/dropdown_icon" android:layout_height="wrap_content" android:layout_margin="8dp" android:layout_width="wrap_content"/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<LinearLayout android:gravity="start" android:layout_gravity="center_vertical" android:layout_height="wrap_content" android:layout_width="wrap_content" android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:gravity="start" android:layout_height="wrap_content" android:layout_width="wrap_content" android:paddingBottom="5dp" android:paddingLeft="5dp" android:paddingRight="5dp" android:paddingTop="5dp" android:text="@string/time_picker_dialog_title" android:textColor="#33B5E5" android:textSize="20sp"/>
<View android:background="#33B5E5" android:layout_height="2dp" android:layout_width="match_parent" android:paddingBottom="5dp" android:paddingTop="5dp"/>
<LinearLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:layout_width="wrap_content" android:orientation="horizontal">
<NumberPicker android:contentDescription="@string/accessibility_time_picker_hour" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/hour" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_weight=".2" android:layout_width="0dp" android:textSize="12sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="@string/time_picker_dialog_hour_minute_separator" android:textSize="12sp"/>
<NumberPicker android:contentDescription="@string/accessibility_time_picker_minute" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/minute" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_weight=".2" android:layout_width="0dp" android:textSize="12sp"/>
<TextView android:id="@+id/second_colon" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="@string/time_picker_dialog_minute_second_separator" android:textSize="12sp"/>
<NumberPicker android:contentDescription="@string/accessibility_time_picker_second" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/second" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_weight=".2" android:layout_width="0dp" android:textSize="12sp"/>
<TextView android:id="@+id/second_dot" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="@string/time_picker_dialog_second_subsecond_separator" android:textSize="12sp"/>
<NumberPicker android:contentDescription="@string/accessibility_time_picker_milli" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/milli" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_weight=".2" android:layout_width="0dp" android:textSize="12sp"/>
<NumberPicker android:contentDescription="@string/accessibility_time_picker_ampm" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/ampm" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_weight=".2" android:layout_width="0dp" android:textSize="12sp"/>
</LinearLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<LinearLayout android:gravity="center" android:id="@+id/pickers" android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="horizontal" xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Position in year -->
<NumberPicker android:contentDescription="@string/accessibility_date_picker_month" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/position_in_year" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_width="wrap_content"/>
<!-- Year -->
<NumberPicker android:contentDescription="@string/accessibility_date_picker_year" android:focusable="true" android:focusableInTouchMode="true" android:id="@+id/year" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_width="wrap_content"/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<RelativeLayout android:background="@drawable/bubble" android:layout_height="wrap_content" android:layout_width="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:id="@+id/top_view" android:layout_alignLeft="@+id/icon_view" android:layout_alignRight="@+id/text_wrapper" android:layout_height="wrap_content" android:layout_width="wrap_content" android:weightSum="1">
<View android:layout_height="0dp" android:layout_weight="0.25" android:layout_width="0dp" android:visibility="invisible"/>
<ImageView android:contentDescription="@null" android:id="@+id/arrow_image" android:layout_height="wrap_content" android:layout_marginBottom="7dp" android:layout_width="wrap_content" android:src="@drawable/bubble_arrow_up"/>
</LinearLayout>
<ImageView android:contentDescription="@null" android:id="@id/icon_view" android:layout_alignParentLeft="true" android:layout_below="@id/top_view" android:layout_height="19dp" android:layout_marginRight="8dp" android:layout_width="19dp" android:src="@drawable/ic_warning"/>
<LinearLayout android:id="@id/text_wrapper" android:layout_below="@id/top_view" android:layout_height="wrap_content" android:layout_toRightOf="@id/icon_view" android:layout_width="wrap_content" android:orientation="vertical">
<TextView android:id="@+id/main_text" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxWidth="300dp" android:textColor="@android:color/black" android:textSize="16sp"/>
<TextView android:id="@+id/sub_text" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxWidth="300dp" android:textColor="#444" android:textSize="13sp"/>
</LinearLayout>
</RelativeLayout>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<!--suppress AlwaysShowAction -->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/select_action_menu_cut"
android:icon="?android:attr/actionModeCutDrawable"
android:title="@android:string/cut"
android:showAsAction="always|withText"
android:alphabeticShortcut="x"
/>
<item
android:id="@+id/select_action_menu_copy"
android:icon="?android:attr/actionModeCopyDrawable"
android:title="@android:string/copy"
android:showAsAction="always|withText"
android:alphabeticShortcut="c"
/>
<item
android:id="@+id/select_action_menu_paste"
android:icon="?android:attr/actionModePasteDrawable"
android:title="@android:string/paste"
android:showAsAction="always|withText"
android:alphabeticShortcut="v"
/>
<item
android:id="@+id/select_action_menu_share"
android:title="@string/actionbar_share"
android:showAsAction="always|withText"
style="@style/SelectActionMenuShare"
/>
<item
android:id="@+id/select_action_menu_select_all"
android:icon="?android:attr/actionModeSelectAllDrawable"
android:title="@android:string/selectAll"
android:showAsAction="always|withText"
android:alphabeticShortcut="a"
/>
<group
android:id="@+id/select_action_menu_text_processing_menus">
</group>
<item
android:id="@+id/select_action_menu_web_search"
android:title="@string/actionbar_web_search"
android:showAsAction="always|withText"
style="@style/SelectActionMenuWebSearch"
/>
</menu>
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