Merge branch 'features/1.2.0_ogawa-y' into contract/kagome/1.0.0

# Conflicts:
#	gradle.properties

ABVJE_UI_Android/res/layout/about_app.xml

@@ -26,7 +26,7 @@
         android:textColor="@color/text_color"
         android:textColor="@color/text_color"
         android:textSize="@dimen/app_normal_text_size" />
         android:textSize="@dimen/app_normal_text_size" />
 
 
-    <TextView
+<!--    <TextView
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:layout_marginTop="5dp"
@@ -43,9 +43,9 @@
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/dummy_str"
         android:text="@string/dummy_str"
         android:textColor="@color/text_color"
         android:textColor="@color/text_color"
-        android:textSize="@dimen/app_normal_text_size" />
+        android:textSize="@dimen/app_normal_text_size" />-->
 
 
-    <TextView
+<!--    <TextView
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:layout_marginTop="5dp"
@@ -62,7 +62,7 @@
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/dummy_str"
         android:text="@string/dummy_str"
         android:textColor="@color/text_color"
         android:textColor="@color/text_color"
-        android:textSize="@dimen/app_normal_text_size" />
+        android:textSize="@dimen/app_normal_text_size" />-->
 
 
     <TextView
     <TextView
         android:id="@+id/textCopyRight"
         android:id="@+id/textCopyRight"

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingFragment.java

@@ -416,21 +416,21 @@ public class ABookSettingFragment extends PreferenceFragment {
 		TextView versionText = (TextView) mainView.findViewById(R.id.textVersion);
 		TextView versionText = (TextView) mainView.findViewById(R.id.textVersion);
 		versionText.setText(version + "(" + releaseDate + ")\n" + "build:" + RawResourceUtil.getShortGitHash(getActivity()));
 		versionText.setText(version + "(" + releaseDate + ")\n" + "build:" + RawResourceUtil.getShortGitHash(getActivity()));
 
 
-		TextView hpText = (TextView) mainView.findViewById(R.id.textHP);
-		hpText.setText(homePage);
+//		TextView hpText = (TextView) mainView.findViewById(R.id.textHP);
+//		hpText.setText(homePage);
 
 
-		TextView contractText = (TextView) mainView.findViewById(R.id.textContact);
-		contractText.setText(contactMail);
-		contractText.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				Intent mailIntent = new Intent();
-				mailIntent.setAction(Intent.ACTION_SEND);
-				mailIntent.setType("text/plain");
-				mailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { contactMail });
-				startActivity(mailIntent);
-			}
-		});
+//		TextView contractText = (TextView) mainView.findViewById(R.id.textContact);
+//		contractText.setText(contactMail);
+//		contractText.setOnClickListener(new OnClickListener() {
+//			@Override
+//			public void onClick(View v) {
+//				Intent mailIntent = new Intent();
+//				mailIntent.setAction(Intent.ACTION_SEND);
+//				mailIntent.setType("text/plain");
+//				mailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { contactMail });
+//				startActivity(mailIntent);
+//			}
+//		});
 
 
 		TextView copyrightText = (TextView) mainView.findViewById(R.id.textCopyRight);
 		TextView copyrightText = (TextView) mainView.findViewById(R.id.textCopyRight);
 		copyrightText.setText(copyright);
 		copyrightText.setText(copyright);

gradle.properties

@@ -87,10 +87,10 @@ repeat_default=true
 
 
 #Setting Info(設定画面のABookについての設定情報)
 #Setting Info(設定画面のABookについての設定情報)
 version_name=1.0.0
 version_name=1.0.0
-release_date=2019/12/23
+release_date=2019/12/24
 copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
 copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
 hope_page=http://www.agentec.jp
 hope_page=http://www.agentec.jp
-contact_email=abook-appsupport@agentec.jp
+contact_email=
 
 
 #Log Settings
 #Log Settings
 log_level=2
 log_level=2