Skip to content

A
abook_check
Commit 96f79ab9 by Kim Jinsung
Options

Merge branch 'features/1.3.200_42761' into 'features/1.3.200' 

Bug #42761【android10不具合対応 Check】作業一覧で、横から縦に画面を動かすと黒い帯がでることがある

See merge request !149
parents 67aa439d 8783a220
Showing with 139 additions and 54 deletions
ABVJE_Launcher_Android/AndroidManifest.xml
...@@ -157,42 +157,40 @@ ...@@ -157,42 +157,40 @@
android:name="jp.agentec.abook.abv.ui.home.activity.LoginActivity" android:name="jp.agentec.abook.abv.ui.home.activity.LoginActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="LoginActivity" android:label="LoginActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" />
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.ContentViewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.ContentViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" />
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.HTMLWebViewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.HTMLWebViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize">
android:theme="@android:style/Theme.NoTitleBar" >
</activity> </activity>
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize">
android:theme="@android:style/Theme.NoTitleBar" >
</activity> </activity>
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.EnqueteWebViewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.EnqueteWebViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar" > >
</activity> </activity>
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" >
</activity> </activity>
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.VideoViewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.VideoViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" >
</activity> </activity>
<activity <activity
android:name="jp.agentec.abook.abv.ui.home.activity.LoginPasswordChangeActivity" android:name="jp.agentec.abook.abv.ui.home.activity.LoginPasswordChangeActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="LoginPasswordChangeActivity" android:label="LoginPasswordChangeActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" >
</activity> </activity>
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivityDialog" android:name="jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivityDialog"
...@@ -201,19 +199,19 @@ ...@@ -201,19 +199,19 @@
android:theme="@style/Theme_Contentdetailview" /> android:theme="@style/Theme_Contentdetailview" />
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivity" <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.DeviceImageListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"/>
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaCameraActivity" <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaCameraActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"/>
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaImageListActivity" <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaImageListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"/>
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaImagePreviewActivity" <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.theta.ThetaImagePreviewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ABookSettingActivity" android:theme="@android:style/Theme.NoTitleBar"/> <activity android:name="jp.agentec.abook.abv.ui.home.activity.ABookSettingActivity" android:theme="@style/Theme.AppCompat.NoActionBar"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ChangePasswordActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/> <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChangePasswordActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ChangePasswordActivityDialog" android:theme="@style/Theme.MyTheme.ModalDialog"/> <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChangePasswordActivityDialog" android:theme="@style/Theme.MyTheme.ModalDialog"/>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.HelpActivity" android:configChanges="orientation|screenSize"/> <activity android:name="jp.agentec.abook.abv.ui.home.activity.HelpActivity" android:configChanges="orientation|screenSize"/>
...@@ -223,11 +221,11 @@ ...@@ -223,11 +221,11 @@
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.AudioPlayActivity" <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.AudioPlayActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" />
<activity android:name="jp.agentec.abook.abv.ui.viewer.activity.ImageViewActivity" <activity android:name="jp.agentec.abook.abv.ui.viewer.activity.ImageViewActivity"
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" />
<activity android:name="jp.agentec.abook.abv.ui.common.activity.ShowPushMessageDailogActivity" <activity android:name="jp.agentec.abook.abv.ui.common.activity.ShowPushMessageDailogActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter> <intent-filter>
...@@ -248,7 +246,7 @@ ...@@ -248,7 +246,7 @@
<activity <activity
android:name="jp.agentec.abook.abv.ui.viewer.activity.OnlineHTMLWebViewActivity" android:name="jp.agentec.abook.abv.ui.viewer.activity.OnlineHTMLWebViewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" >
</activity> </activity>
<activity android:name="jp.agentec.abook.abv.ui.home.activity.ChatWebviewActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChatWebviewActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
......
ABVJE_UI_Android/res/drawable/bg_edit_text_view.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!--The outline turns to colorPrimary when the EditText is in focus-->
<item android:state_enabled="true" android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
<corners android:radius="1dp" />
<stroke android:width="3dp" android:color="@android:color/holo_orange_light" />
<padding
android:bottom="7dp"
android:left="7dp"
android:right="7dp"
android:top="7dp" />
</shape>
</item>
<!--The outline turns to grey when the EditText is out of focus-->
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
<corners android:radius="1dp" />
<stroke android:width="1dp" android:color="@android:color/white" />
<padding
android:bottom="7dp"
android:left="7dp"
android:right="7dp"
android:top="7dp" />
</shape>
</item>
</selector>
\ No newline at end of file
ABVJE_UI_Android/res/layout/ac_html_webview.xml
...@@ -49,16 +49,17 @@ ...@@ -49,16 +49,17 @@
android:visibility="gone" android:visibility="gone"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<Button <ImageButton
android:id="@+id/btn_operation_home" android:id="@+id/btn_operation_home"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:visibility="gone"
android:background="@drawable/ic_operation_home" android:background="@drawable/ic_operation_home"
android:contentDescription="@string/cont_desc" /> android:contentDescription="@string/cont_desc"
android:visibility="gone" />
<ImageButton <ImageButton
android:id="@+id/btn_remote_pause" android:id="@+id/btn_remote_pause"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
ABVJE_UI_Android/res/layout/ac_login.xml
...@@ -36,15 +36,17 @@ ...@@ -36,15 +36,17 @@
android:id="@+id/edt_site_id" android:id="@+id/edt_site_id"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="@string/title_site_id" android:hint="@string/title_site_id"
android:inputType="number" android:inputType="number"
android:visibility="gone" android:maxLines="1"
android:maxLines="1" /> android:visibility="gone" />
<jp.agentec.abook.abv.ui.common.view.ABVEditText <jp.agentec.abook.abv.ui.common.view.ABVEditText
android:id="@+id/edt_url_path" android:id="@+id/edt_url_path"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="@string/title_url_path" android:hint="@string/title_url_path"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:maxLines="1" /> android:maxLines="1" />
...@@ -53,6 +55,7 @@ ...@@ -53,6 +55,7 @@
android:id="@+id/edt_id" android:id="@+id/edt_id"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:focusable="true" android:focusable="true"
android:hint="@string/title_id" android:hint="@string/title_id"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
...@@ -75,7 +78,7 @@ ...@@ -75,7 +78,7 @@
android:background="@drawable/btn_login" android:background="@drawable/btn_login"
android:contentDescription="@string/login" android:contentDescription="@string/login"
android:text="@string/login" android:text="@string/login"
android:textColor="@color/text_color"/> android:textColor="@color/text_color" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
ABVJE_UI_Android/res/layout/ac_online_html_webview.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
android:background="@null" android:background="@null"
android:src="@drawable/btn_history_back_for_webview" /> android:src="@drawable/btn_history_back_for_webview" />
<Button <ImageButton
android:id="@+id/closeBtn" android:id="@+id/closeBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
ABVJE_UI_Android/res/layout/content_view_toolbar.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
android:background="@drawable/btn_home" android:background="@drawable/btn_home"
android:contentDescription="@string/end" /> android:contentDescription="@string/end" />
<Button <ImageButton
android:id="@+id/btn_operation_home" android:id="@+id/btn_operation_home"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@drawable/frame" android:background="@drawable/frame"
android:textColor="@android:color/white"
android:padding="8dp" android:padding="8dp"
android:text="@string/dummy_str" android:text="@string/dummy_str"
android:textSize="15sp" android:textSize="15sp"
......
ABVJE_UI_Android/res/layout/custom_preference_category.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="5dp"
android:textColor="@android:color/darker_gray"
android:textSize="14sp"
android:textStyle="bold"
android:background="@android:color/black"/>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/page_number.xml
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
android:textSize="20sp" android:textSize="20sp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:textColor="@android:color/white"
android:background="@drawable/rounded_edittext" android:background="@drawable/rounded_edittext"
/> />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/setting_fragment.xml
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollingCache="false" /> android:scrollingCache="false"
android:divider="@android:color/holo_red_dark"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/values/themes_abook.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- Generated with http://android-holo-colors.com --> <!-- Generated with http://android-holo-colors.com -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="ABook" parent="android:Theme.Light"> <style name="ABook" parent="Theme.AppCompat.Light">
<!-- <item name="android:editTextStyle">@style/EditTextABook</item> --> <!-- <item name="android:editTextStyle">@style/EditTextABook</item> -->
...@@ -30,6 +30,43 @@ ...@@ -30,6 +30,43 @@
<item name="android:textViewStyle">@style/TextViewABook</item> <item name="android:textViewStyle">@style/TextViewABook</item>
<item name="android:alertDialogStyle">@style/Theme_ABookAlertDialog</item> <item name="android:alertDialogStyle">@style/Theme_ABookAlertDialog</item>
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<!-- add EditText Style -->
<item name="android:editTextColor">@android:color/black</item>
<item name="android:textColorHint">@android:color/darker_gray</item>
<item name="android:editTextBackground">@drawable/bg_edit_text_view</item>
</style>
<style name="Theme.AppCompat.Light.NoActionBar.FullScreen" parent="@style/Theme.AppCompat.Light">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@android:color/black</item>
<!-- add FullScreen Style -->
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
<!-- add EditText Style -->
<item name="android:editTextColor">@android:color/black</item>
<item name="android:textColorHint">@android:color/darker_gray</item>
<item name="android:editTextBackground">@drawable/bg_edit_text_view</item>
</style> </style>
<!-- add ProgressDialog Style -->
<style name="MyDialogTheme" parent="@style/Theme.AppCompat.Light.Dialog">
<item name="android:colorAccent">@color/colorPrimary</item>
<item name="colorAccent">@color/colorPrimary</item>
<item name="android:background">#00FFFFFF</item>
</style>
</resources> </resources>
\ No newline at end of file
ABVJE_UI_Android/res/xml/pref.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
<PreferenceCategory android:title="@string/account" android:key="account_set"> <PreferenceCategory
android:key="account_set"
android:title="@string/account"
android:layout="@layout/custom_preference_category">
<PreferenceScreen <PreferenceScreen
android:key="accountPath" android:key="accountPath"
android:summary="--" android:summary="--"
android:title="@string/contractor" > android:title="@string/contractor"></PreferenceScreen>
</PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="loginid" android:key="loginid"
android:summary="--" android:summary="--"
android:title="@string/logid" > android:title="@string/logid"></PreferenceScreen>
</PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="lastLogin" android:key="lastLogin"
android:summary="--" android:summary="--"
android:title="@string/last_login" > android:title="@string/last_login"></PreferenceScreen>
</PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="passwordChange" android:key="passwordChange"
android:summary="@string/password_change_summary" android:summary="@string/password_change_summary"
android:title="@string/pwd_change" > android:title="@string/pwd_change"></PreferenceScreen>
</PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="logout" android:key="logout"
android:summary="@string/logout_summary" android:summary="@string/logout_summary"
android:title="@string/logout" > android:title="@string/logout"></PreferenceScreen>
</PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/log_info" android:key="log_info"> <PreferenceCategory android:title="@string/log_info" android:key="log_info" android:layout="@layout/custom_preference_category">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="errorSendEnable" android:key="errorSendEnable"
...@@ -40,7 +38,7 @@ ...@@ -40,7 +38,7 @@
android:title="@string/export_title" > android:title="@string/export_title" >
</PreferenceScreen> </PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/app_info" android:key="app_info"> <PreferenceCategory android:title="@string/app_info" android:key="app_info" android:layout="@layout/custom_preference_category">
<PreferenceScreen <PreferenceScreen
android:key="aboutABook" android:key="aboutABook"
android:title="@string/about_app" > android:title="@string/about_app" >
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVActivity.java
package jp.agentec.abook.abv.ui.common.activity; package jp.agentec.abook.abv.ui.common.activity;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityManager.RunningTaskInfo;
import android.app.AlarmManager;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.PendingIntent;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
...@@ -70,7 +64,6 @@ import jp.agentec.abook.abv.cl.util.PreferenceUtil; ...@@ -70,7 +64,6 @@ import jp.agentec.abook.abv.cl.util.PreferenceUtil;
import jp.agentec.abook.abv.launcher.android.ABVApplication; import jp.agentec.abook.abv.launcher.android.ABVApplication;
import jp.agentec.abook.abv.launcher.android.ABVUIDataCache; import jp.agentec.abook.abv.launcher.android.ABVUIDataCache;
import jp.agentec.abook.abv.launcher.android.R; import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.PrefName;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.UserPrefKey; import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.UserPrefKey;
import jp.agentec.abook.abv.ui.common.constant.ErrorCode; import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
import jp.agentec.abook.abv.ui.common.constant.ErrorMessage; import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
...@@ -256,7 +249,7 @@ public abstract class ABVActivity extends Activity { ...@@ -256,7 +249,7 @@ public abstract class ABVActivity extends Activity {
} }
if (progressDialog == null) { if (progressDialog == null) {
progressDialog = new ProgressDialog(this); progressDialog = new ProgressDialog(this, R.style.MyDialogTheme);
if (progressDialog.getWindow() != null) { if (progressDialog.getWindow() != null) {
progressDialog.setMessage(getResources().getString(R.string.progress)); progressDialog.setMessage(getResources().getString(R.string.progress));
progressDialog.setIndeterminate(true); progressDialog.setIndeterminate(true);
...@@ -267,7 +260,7 @@ public abstract class ABVActivity extends Activity { ...@@ -267,7 +260,7 @@ public abstract class ABVActivity extends Activity {
} }
if (progressDialogHorizontal == null) { if (progressDialogHorizontal == null) {
progressDialogHorizontal = new ProgressDialog(this); progressDialogHorizontal = new ProgressDialog(this, R.style.MyDialogTheme);
if (progressDialogHorizontal.getWindow() != null) { if (progressDialogHorizontal.getWindow() != null) {
progressDialogHorizontal.setIndeterminate(false); progressDialogHorizontal.setIndeterminate(false);
progressDialogHorizontal.setMax(100); // 最大値を設定 progressDialogHorizontal.setMax(100); // 最大値を設定
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -124,7 +124,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -124,7 +124,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
private String mReportFileName; private String mReportFileName;
protected TextView operationNameTitle; protected TextView operationNameTitle;
protected Button operationHomeButton; protected ImageButton operationHomeButton;
protected ImageButton taskListButton; protected ImageButton taskListButton;
// protected ImageButton helpButton; // protected ImageButton helpButton;
...@@ -656,7 +656,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -656,7 +656,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
fl = (RelativeLayout) findViewById(R.id.frameTopbar); fl = (RelativeLayout) findViewById(R.id.frameTopbar);
} }
fl.setBackgroundColor(getResources().getColor(R.color.operation_color)); fl.setBackgroundColor(getResources().getColor(R.color.operation_color));
operationHomeButton = (Button) findViewById(R.id.btn_operation_home); operationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
operationHomeButton.setOnClickListener(new View.OnClickListener() { operationHomeButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/OnlineHTMLWebViewActivity.java
...@@ -35,7 +35,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity { ...@@ -35,7 +35,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
private static final String TAG = "OnlineHTMLWebView"; private static final String TAG = "OnlineHTMLWebView";
private WebView webView; private WebView webView;
private Button closeButton; private ImageButton closeButton;
private ImageButton backButton; private ImageButton backButton;
@Override @Override
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
...@@ -170,7 +170,7 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -170,7 +170,7 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
addSceneButton = (ImageButton) findViewById(R.id.btn_add_scene); addSceneButton = (ImageButton) findViewById(R.id.btn_add_scene);
taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list); taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list);
// helpButton = (ImageButton) findViewById(R.id.btn_help); // helpButton = (ImageButton) findViewById(R.id.btn_help);
operationHomeButton = (Button) findViewById(R.id.btn_operation_home); operationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
if (mXWalkOpenType == Constant.XWalkOpenType.DEFAULT) { if (mXWalkOpenType == Constant.XWalkOpenType.DEFAULT) {
// helpButton.setVisibility(View.GONE); // helpButton.setVisibility(View.GONE);
......
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