Merge branch 'features/1.4.203_46276' into features/1.4.210

# Conflicts:
#	ABVJE_Res_Default_Android/res/values-ja/strings.xml
#	ABVJE_Res_Default_Android/res/values-ko/strings.xml
#	ABVJE_Res_Default_Android/res/values/strings.xml

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/ABVEnvironment.java

@@ -64,6 +64,9 @@ public class ABVEnvironment {
 
 	public boolean operationGroupMasterClearFlg;
 
+	// プライバシーポリシーURL
+	public String privacyPolicyUrl;
+
 	//////////////////////////////    定数    //////////////////////////////////
 	
 	private static final String ServerTimeKey = "ABook";

ABVJE_Res_Default_Android/build.gradle

@@ -56,6 +56,9 @@ android {
         resValue("integer", "push_message", "${push_message}")
         resValue("integer", "check_app_update", "${check_app_update}")
         resValue("integer", "not_delete_all_contents", "${not_delete_all_contents}")
+
+        // privacy policy
+        resValue("string", "privacy_policy_url", "${privacy_policy_url}")
     }
     sourceSets {
         main {

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1508,6 +1508,6 @@
     <string name="btn_communication">コミュニケーション</string>
     <string name="btn_setting">設定</string>
     <string name="btn_print">PDF</string>
-
     <string name="msg_oz_report_cancel">キャンセルした場合入力内容は破棄されます。よろしいですか？</string>
+    <string name="privacy_policy">プライバシーポリシー</string>
 </resources>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1513,6 +1513,6 @@
     <string name="btn_communication">커뮤니케이션</string>
     <string name="btn_setting">설정</string>
     <string name="btn_print">PDF</string>
-
     <string name="msg_oz_report_cancel">취소할 경우 입력내용은 파기됩니다. 괜찮으시겠습니까?</string>
+    <string name="privacy_policy">개인정보취급방침</string>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1509,6 +1509,6 @@
     <string name="btn_communication">Communication</string>
     <string name="btn_setting">Setting</string>
     <string name="btn_print">PDF</string>
-
     <string name="msg_oz_report_cancel">If you cancel, your input will be discarded. Is it OK?</string>
+    <string name="privacy_policy">Privacy Policy</string>
 </resources>

ABVJE_UI_Android/res/xml/pref.xml

@@ -58,6 +58,11 @@
             android:layout="@layout/custom_preference_screen">
         </PreferenceScreen>
         <PreferenceScreen
+            android:key="privacyPolicy"
+            android:title="@string/privacy_policy"
+            android:layout="@layout/custom_preference_screen">
+        </PreferenceScreen>
+        <PreferenceScreen
             android:key="checkAppUpdate"
             android:title="@string/check_app_update"
             android:layout="@layout/custom_preference_screen">

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/util/Initializer.java

@@ -139,6 +139,9 @@ public class Initializer {
 			}
 			env.aspectType = getAspectType();
 
+			// privacy policy url
+			env.privacyPolicyUrl = s(R.string.privacy_policy_url);
+
 			env.setInitialized(true);
 
 			// Helperクラス初期化

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

@@ -85,7 +85,8 @@ public class ABookSettingFragment extends PreferenceFragment {
 	private static final String CHECK_APP_UPDATE = "checkAppUpdate";
 	private static final String ABOUT_A_BOOK = "aboutABook";
 	private static final String ABOOK_CHECK_MANUAL = "abookCheckManual";
-	
+	private static final String PRIVACY_POLICY = "privacyPolicy";
+
 	protected Handler handler = new Handler();
 	protected AlertDialog alertDialog = null;
 	private SharedPreferences pref;
@@ -250,6 +251,17 @@ public class ABookSettingFragment extends PreferenceFragment {
 			}
 		});
 
+		// プライバシーポリシー
+		Preference privacyPolicy = findPreference(PRIVACY_POLICY);
+		privacyPolicy.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+			@Override
+			public boolean onPreferenceClick(Preference preference) {
+				Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.privacy_policy_url)));
+				startActivity(browserIntent);
+				return true;
+			}
+		});
+
 		// アップデート確認
 		Preference checkAppUpdate = findPreference(CHECK_APP_UPDATE);
 		if (getResources().getInteger(R.integer.check_app_update) == 1) {

gradle.properties

@@ -132,4 +132,7 @@ isStoreProduct=false
 #1.2.302 Edition
 #CHECK = 5
 #EXFRAME = 6
-edition_type=5
\ No newline at end of file
+edition_type=5
+
+#プライバシーポリシーURL
+privacy_policy_url=https://www.agentec.jp/privacy/
\ No newline at end of file