diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-21 12:16:50 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-24 18:44:22 +0100 |
| commit | c31e0a0b189505e2f9d5319a033f3cd237720dd6 (patch) | |
| tree | c8c9f51324bc95d45d36662123143d646cbf5272 /android | |
| parent | 7ed1d7a42d7faa9094cfda76f7351cd4951ae4dd (diff) | |
Change a SwitchPreference to CheckBoxPreference for Android 2 compatibility.
(SwitchPreference requires android api >= 14, i.e. Android 4.)
Change-Id: I69d83946407d008b8e47b320b5a4f5120c0ff35d
Diffstat (limited to 'android')
| -rw-r--r-- | android/sdremote/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | android/sdremote/res/xml/preferences.xml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 80a25410113b..4a5811fccf67 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -32,6 +32,7 @@ <activity android:name=".PairingActivity" android:icon="@drawable/actionbar_icon_computer" + android:logo="@drawable/actionbar_icon_computer" android:noHistory="true" > </activity> diff --git a/android/sdremote/res/xml/preferences.xml b/android/sdremote/res/xml/preferences.xml index 5d7e68b8b834..0a1006365be2 100644 --- a/android/sdremote/res/xml/preferences.xml +++ b/android/sdremote/res/xml/preferences.xml @@ -2,11 +2,11 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <!-- <SwitchPreference android:defaultValue="false" android:title="@string/options_autodecline" android:key="option_autodecline"/> --> - <SwitchPreference + <CheckBoxPreference android:defaultValue="false" android:key="option_volumeswitching" - android:title="@string/options_volumeswitching" - android:summary="@string/options_volumeswitching_descripton"/> + android:summary="@string/options_volumeswitching_descripton" + android:title="@string/options_volumeswitching" /> <Preference android:key="option_switchcomputer" |