| Index: mobile/android/base/resources/xml/preferences_abb_abp.xml |
| =================================================================== |
| --- a/mobile/android/base/resources/xml/preferences_abb_abp.xml |
| +++ b/mobile/android/base/resources/xml/preferences_abb_abp.xml |
| @@ -10,44 +10,36 @@ |
| android:title="@string/abb_pref_category_abp" |
| android:summary="@string/abb_pref_category_abp_summary" |
| android:defaultValue="true" |
| android:persistent="false" /> |
| <PreferenceCategory android:title="@string/abb_pref_category_blocking" |
| android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled" > |
|
diegocarloslima
2017/07/19 16:12:02
There are some indentation adjustments required in
|
| <PreferenceScreen android:title="@string/abb_pref_category_languages" |
| - android:summary="@string/abb_pref_category_languages_summary" > |
| - <intent android:action="android.intent.action.VIEW" |
| - android:targetPackage="@string/android_package_name" |
| - android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" > |
| - <extra android:name="resource" |
| - android:value="preferences_abb_adblocking" /> |
| - </intent> |
| + android:summary="@string/abb_pref_category_languages_summary" |
| + android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| + <extra android:name="resource" |
| + android:value="preferences_abb_adblocking" /> |
| </PreferenceScreen> |
| <PreferenceScreen android:title="@string/abb_pref_category_more_blocking" |
| - android:summary="@string/abb_pref_category_more_blocking_summary" > |
| - <intent android:action="android.intent.action.VIEW" |
| - android:targetPackage="@string/android_package_name" |
| - android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" > |
| - <extra android:name="resource" |
| - android:value="preferences_abb_more_blocking" /> |
| - </intent> |
| + android:summary="@string/abb_pref_category_more_blocking_summary" |
| + android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| + <extra android:name="resource" |
| + android:value="preferences_abb_more_blocking" /> |
| </PreferenceScreen> |
| </PreferenceCategory> |
| + |
| <PreferenceCategory android:title="@string/abb_pref_category_exceptions" |
| android:dependency="android.not_a_preference.adblockbrowser.apiAdblockPlusEnabled" > |
| <PreferenceScreen android:title="@string/abb_pref_category_acceptable_ads" |
| - android:summary="@string/abb_pref_category_acceptable_ads_summary" > |
| - <intent android:action="android.intent.action.VIEW" |
| - android:targetPackage="@string/android_package_name" |
| - android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" > |
| - <extra android:name="resource" |
| - android:value="preferences_abb_abp_acceptable_ads" /> |
| - </intent> |
| + android:summary="@string/abb_pref_category_acceptable_ads_summary" |
| + android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" > |
| + <extra android:name="resource" |
| + android:value="preferences_abb_abp_acceptable_ads" /> |
| </PreferenceScreen> |
| <!-- Commented out until implemented |
| <PreferenceScreen android:title="@string/abb_pref_category_whitelisted_sites" |
| android:summary="@string/abb_pref_category_whitelisted_sites_summary" > |
| </PreferenceScreen> |
| --> |
| </PreferenceCategory> |