aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjruesga <jorge@ruesga.com>2013-07-03 01:10:47 +0200
committerjruesga <jorge@ruesga.com>2013-07-03 01:10:47 +0200
commitb56df92031af88fb0a577b2a2ae5d75b826a7347 (patch)
treebc91dd5d3d2038615a80b57214de2842343c886e /res
parenta3e8697366fe49c8b11060dab01466d6390beb3c (diff)
downloadandroid_packages_wallpapers_PhotoPhase-b56df92031af88fb0a577b2a2ae5d75b826a7347.tar.gz
android_packages_wallpapers_PhotoPhase-b56df92031af88fb0a577b2a2ae5d75b826a7347.tar.bz2
android_packages_wallpapers_PhotoPhase-b56df92031af88fb0a577b2a2ae5d75b826a7347.zip
Force redraw and empty texture buffer. Clear images buffer on reload
Initial layout disposition Signed-off-by: jruesga <jorge@ruesga.com>
Diffstat (limited to 'res')
-rw-r--r--res/drawable/frame.xml22
-rw-r--r--res/layout/choose_disposition_fragment.xml24
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/xml/preferences_layout.xml20
4 files changed, 69 insertions, 1 deletions
diff --git a/res/drawable/frame.xml b/res/drawable/frame.xml
new file mode 100644
index 0000000..bc433e9
--- /dev/null
+++ b/res/drawable/frame.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <stroke android:width="1dp" android:color="#000" />
+ <solid android:color="@android:color/darker_gray"/>
+</shape>
+
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml
new file mode 100644
index 0000000..becf879
--- /dev/null
+++ b/res/layout/choose_disposition_fragment.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/default_margin"
+ android:layout_marginBottom="@dimen/default_margin">
+
+ <!-- Resize widgets are inserted here -->
+</RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ece6be..4aa51d4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -68,6 +68,10 @@
<string name="pref_layout">Layout</string>
<string name="pref_layout_summary">Select how pictures are disposed on the screen</string>
<string name="pref_layout_disposition">Disposition</string>
+ <string name="pref_disposition_portrait">Portrait disposition</string>
+ <string name="pref_disposition_portrait_summary">Select how pictures are disposed on a portrait screen</string>
+ <string name="pref_disposition_landscape">Landscape disposition</string>
+ <string name="pref_disposition_landscape_summary">Select how pictures are disposed on a landscape screen</string>
<string name="pref_about">About</string>
<string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>
diff --git a/res/xml/preferences_layout.xml b/res/xml/preferences_layout.xml
index 6fdf438..7d2a9f2 100644
--- a/res/xml/preferences_layout.xml
+++ b/res/xml/preferences_layout.xml
@@ -14,13 +14,31 @@
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:photophase="http://schemas.android.com/apk/res/org.cyanogenmod.wallpapers.photophase">
<!-- Disposition -->
<PreferenceCategory
android:key="category_disposition"
android:title="@string/pref_layout_disposition">
+ <!-- Portrait -->
+ <Preference
+ android:key="ui_disposition_portrait"
+ android:title="@string/pref_disposition_portrait"
+ android:summary="@string/pref_disposition_portrait_summary"
+ android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.PortraitDispositionFragment"
+ android:persistent="false" />
+
+ <!-- Landscape -->
+ <Preference
+ android:key="ui_disposition_landscape"
+ android:title="@string/pref_disposition_landscape"
+ android:summary="@string/pref_disposition_landscape_summary"
+ android:fragment="org.cyanogenmod.wallpapers.photophase.preferences.LandscapeDispositionFragment"
+ android:persistent="false" />
+
</PreferenceCategory>
</PreferenceScreen>