Merge "Shows a toast message if failed to open urls." into nyc-dev am: 127bec98c5
am: a118818093
* commit 'a11881809330499145d38d74a1a78c4b0163860f':
Shows a toast message if failed to open urls.
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index cc4a360..f1e5c34 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -821,6 +821,9 @@
<!-- Title for the activity that displays licenses for open source libraries. [CHAR LIMIT=100]-->
<string name="activity_title_licenses">Open source licenses</string>
+ <!-- Toast message showing when failed to open the url. [CHAR LIMIT=100]-->
+ <string name="url_open_error_toast">Failed to open the url.</string>
+
<!-- Content description of entries (including that radio button is checked) in contact
accounts list filter. For example: Google abc@gmail.com checked, etc [CHAR LIMIT=30]-->
<string name="account_filter_view_checked"><xliff:g id="account_info">%s</xliff:g> checked</string>
diff --git a/res-common/xml/preference_about.xml b/res-common/xml/preference_about.xml
index 005485c..a109db6 100644
--- a/res-common/xml/preference_about.xml
+++ b/res-common/xml/preference_about.xml
@@ -30,15 +30,11 @@
android:icon="@null"
android:key="@string/pref_privacy_policy_key"
android:title="@string/about_privacy_policy">
- <intent android:action="android.intent.action.VIEW"
- android:data="http://www.google.com/policies/privacy" />
</Preference>
<Preference
android:icon="@null"
android:key="@string/pref_terms_of_service_key"
android:title="@string/about_terms_of_service">
- <intent android:action="android.intent.action.VIEW"
- android:data="http://www.google.com/policies/terms" />
</Preference>
</PreferenceScreen>