diff options
author | Pankaj Garg <pgarg@codeaurora.org> | 2015-07-28 09:37:48 -0700 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:46 +0200 |
commit | 8a9eba662e3437b3dd39ff09e4210b8eec53dd97 (patch) | |
tree | f20a6c2b6d6f48e5b8c61596a93859de31387e10 /res | |
parent | 1f998aee3336c5cc684290f7049d2c382fd92fed (diff) | |
download | android_packages_apps_Gello-8a9eba662e3437b3dd39ff09e4210b8eec53dd97.tar.gz android_packages_apps_Gello-8a9eba662e3437b3dd39ff09e4210b8eec53dd97.tar.bz2 android_packages_apps_Gello-8a9eba662e3437b3dd39ff09e4210b8eec53dd97.zip |
Mechanism to clear data through "Reset to default" setting
- Added hooks in BrowserYesNoPreference to support a third
button.
- Enabled the third button for "Reset to default" setting
- If user clicks on this new button, it'll also clear the
private data (history, cache, etc)
Change-Id: I7b224805d2ab8ef440a13948821c871b0b4a791e
Diffstat (limited to 'res')
-rw-r--r-- | res/values/attrs.xml (renamed from res/values/attrs_tiles.xml) | 5 | ||||
-rw-r--r-- | res/xml/general_preferences.xml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/res/values/attrs_tiles.xml b/res/values/attrs.xml index d6ec2927..3e622618 100644 --- a/res/values/attrs_tiles.xml +++ b/res/values/attrs.xml @@ -40,4 +40,9 @@ <attr name="android:label" /> </declare-styleable> + <declare-styleable name="BrowserYesNoPreference"> + <attr name="positiveButtonText" format="string|reference" /> + <attr name="negativeButtonText" format="string|reference" /> + <attr name="neutralButtonText" format="string|reference" /> + </declare-styleable> </resources> diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml index 75b4600f..88d0e327 100644 --- a/res/xml/general_preferences.xml +++ b/res/xml/general_preferences.xml @@ -14,8 +14,8 @@ limitations under the License. --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > <PreferenceCategory android:layout="@layout/swe_preference_category_first" android:title="@string/pref_general_title"> @@ -107,6 +107,7 @@ android:key="reset_default_preferences" android:title="@string/pref_extras_reset_default" android:summary="@string/pref_extras_reset_default_summary" + app:neutralButtonText="@string/website_settings_clear_all" android:dialogMessage="@string/pref_extras_reset_default_dlg" android:dialogIcon="@android:drawable/ic_dialog_alert" /> |