From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 10:24:29 +0000 (+0200)
Subject: Merge branch 'setup_colors' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea7f8fe49152fee3d92f1762d0e6538fa081c9d8?ds=inline;hp=-c

Merge branch 'setup_colors' into setup_app_name
---

ea7f8fe49152fee3d92f1762d0e6538fa081c9d8
diff --combined res/values/setup.xml
index d65bff5d,59e0bf60..2c73d269
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -1,15 -1,5 +1,15 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <resources>
 +    <!-- App name  and other strings-->
 +    <string name="app_name">ownCloud</string>
 +    <string name="account_type">owncloud</string>
 +    <string name="authority">org.owncloud</string>
 +    <string name ="db_file">owncloud.db</string>
 +    <string name ="db_name">ownCloud</string>
 +    <string name ="data_folder"></string>
 +    <string name ="log_name">Owncloud_</string>
 +    
 +    <!-- Server URL -->
      <string name="server_url"></string>
      <bool name="show_server_url_input">true</bool>
      
@@@ -17,4 -7,9 +17,9 @@@
      <string name="auth_method_oauth2">off</string>
      <string name="auth_method_saml_web_sso">off</string>
      
+     <!-- Colors -->
+     <color name="background_color">#F7F7F7</color>
+     <color name="actionbar_start_color">#1D2D44</color>
+     <color name="actionbar_end_color">#1D2D44</color>
+     
  </resources>