Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta

[pub/Android/ownCloud.git] / res / values / attrs.xml

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 800a4b6..d51b3c0 100644 (file)
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -11,4 +11,13 @@
 
        </declare-styleable>
 
+       <string-array name="pref_behaviour_entries">
+               <item>@string/pref_behaviour_entries_keep_file</item>
+               <item>@string/pref_behaviour_entries_move</item>
+       </string-array>
+
+       <string-array name="pref_behaviour_entryValues">
+               <item>NOTHING</item>
+               <item>MOVE</item>
+       </string-array>
 </resources>
\ No newline at end of file