diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-07-28 13:02:13 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:23:05 +0100 |
| commit | 610fc391cbf3a20f316f960526b2da29b6f9109c (patch) | |
| tree | f28d9c8313193ccc62c010ce73b76b7d46a07a73 /android/sdremote/res | |
| parent | 8f08b8f456530a63c76ad1282d6b8643dae15b34 (diff) | |
Added options screen.
Change-Id: Ifb7abc67383a72969e37d8e46a14fdaa76e47112
Diffstat (limited to 'android/sdremote/res')
| -rw-r--r-- | android/sdremote/res/layout/activity_settings.xml | 6 | ||||
| -rw-r--r-- | android/sdremote/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | android/sdremote/res/values/styles.xml | 1 | ||||
| -rw-r--r-- | android/sdremote/res/xml/preferences.xml | 7 |
4 files changed, 16 insertions, 1 deletions
diff --git a/android/sdremote/res/layout/activity_settings.xml b/android/sdremote/res/layout/activity_settings.xml new file mode 100644 index 000000000000..be5e64506c8e --- /dev/null +++ b/android/sdremote/res/layout/activity_settings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<fragment xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/settings_fragment" + android:name="org.libreoffice.impressremote.SettingsFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index 991d6929885b..c3117cfd8038 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -14,4 +14,7 @@ <string name="clock_timer_restart">Restart</string> <string name="clock_timer_reset">Reset</string> <string name="clock_timer_resume">Resume</string> + <string name="options_autodecline">Auto-decline calls</string> + <string name="options_volumeswitching">Change slides using volume buttons</string> + <string name="options_switchcomputer">Switch computer</string> </resources>
\ No newline at end of file diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index bb11845e4ad1..04143c4958ef 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -13,7 +13,6 @@ <style name="Theme.ImpressRemote.ActionBar" parent="android:style/Widget.Holo.Light.ActionBar"> <item name="android:background">@color/orange</item> - <item name="android:displayOptions">showCustom</item> </style> <style name="Theme.ImpressRemote.ActionBarWidget" parent="android:style/Widget.Holo.Light"> diff --git a/android/sdremote/res/xml/preferences.xml b/android/sdremote/res/xml/preferences.xml new file mode 100644 index 000000000000..b475ca617fc4 --- /dev/null +++ b/android/sdremote/res/xml/preferences.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > + <SwitchPreference android:defaultValue="false" android:title="@string/options_autodecline"/> + <SwitchPreference android:defaultValue="false" android:title="@string/options_volumeswitching"/> + + +</PreferenceScreen>
\ No newline at end of file |