From 656a25d94498fb282edab320ddf3a5a711e45196 Mon Sep 17 00:00:00 2001
From: vanitasvitae <heinrich.hux@gmail.com>
Date: Tue, 24 Feb 2015 22:04:02 +0100
Subject: [PATCH] Added Settings Activity and new Color Scheme

---
 .../libraries/support_annotations_21_0_3.xml  |  11 ++
 .idea/libraries/support_v4_21_0_3.xml         |  11 ++
 app/app.iml                                   |  48 +++--
 app/build.gradle                              |   3 +-
 app/src/main/AndroidManifest.xml              |   6 +-
 .../enigmandroid/MainActivity.java            |   6 +
 .../enigmandroid/SettingsActivity.java        | 181 ++++++++++++++++++
 app/src/main/res/drawable/button.xml          |  39 ++++
 app/src/main/res/layout/activity_main.xml     |   4 +-
 app/src/main/res/menu/main.xml                |   8 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   1 +
 .../res/values/strings_activity_settings.xml  |  14 ++
 app/src/main/res/values/styles.xml            |   2 +-
 app/src/main/res/xml/pref_headers.xml         |   9 +
 app/src/main/res/xml/pref_simulation.xml      |   8 +
 build.gradle                                  |   2 +-
 build/intermediates/dex-cache/cache.xml       |  26 +++
 build/intermediates/model_data.bin            | Bin 45216 -> 66966 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 local.properties                              |   5 +-
 21 files changed, 366 insertions(+), 24 deletions(-)
 create mode 100644 .idea/libraries/support_annotations_21_0_3.xml
 create mode 100644 .idea/libraries/support_v4_21_0_3.xml
 create mode 100644 app/src/main/java/de/vanitasvitae/enigmandroid/SettingsActivity.java
 create mode 100644 app/src/main/res/drawable/button.xml
 create mode 100644 app/src/main/res/values/strings_activity_settings.xml
 create mode 100644 app/src/main/res/xml/pref_headers.xml
 create mode 100644 app/src/main/res/xml/pref_simulation.xml
 create mode 100644 build/intermediates/dex-cache/cache.xml

diff --git a/.idea/libraries/support_annotations_21_0_3.xml b/.idea/libraries/support_annotations_21_0_3.xml
new file mode 100644
index 0000000..64c9f2a
--- /dev/null
+++ b/.idea/libraries/support_annotations_21_0_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="support-annotations-21.0.3">
+    <CLASSES>
+      <root url="jar://$APPLICATION_HOME_DIR$/android-sdk-linux/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$APPLICATION_HOME_DIR$/android-sdk-linux/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml
new file mode 100644
index 0000000..71d6b73
--- /dev/null
+++ b/.idea/libraries/support_v4_21_0_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="support-v4-21.0.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/libs/internal_impl-21.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 119070b..4a23228 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,10 +9,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,6 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -30,37 +33,60 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
index 6a744d0..81f6060 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,12 +13,11 @@ android {
     }
     buildTypes {
         release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:support-v4:21.+'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6017c5a..28ecdea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.vanitasvitae.enigmandroid">
+    package="de.vanitasvitae.enigmandroid" >
 
     <application
         android:allowBackup="true"
@@ -16,6 +16,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/title_activity_settings" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java b/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
index 9dc0de2..eee9702 100644
--- a/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
+++ b/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java
@@ -3,6 +3,7 @@ package de.vanitasvitae.enigmandroid;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Menu;
@@ -71,6 +72,11 @@ public class MainActivity extends Activity
             showRingsettingsDialog();
             return true;
         }
+        else if (id == R.id.action_settings)
+        {
+            Intent i = new Intent(this, SettingsActivity.class);
+            startActivityForResult(i, 0);
+        }
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/SettingsActivity.java b/app/src/main/java/de/vanitasvitae/enigmandroid/SettingsActivity.java
new file mode 100644
index 0000000..d9eb9f5
--- /dev/null
+++ b/app/src/main/java/de/vanitasvitae/enigmandroid/SettingsActivity.java
@@ -0,0 +1,181 @@
+package de.vanitasvitae.enigmandroid;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.RingtonePreference;
+import android.text.TextUtils;
+
+
+import java.util.List;
+
+/**
+ * A {@link PreferenceActivity} that presents a set of application settings. On
+ * handset devices, settings are presented as a single list. On tablets,
+ * settings are split by category, with category headers shown to the left of
+ * the list of settings.
+ * <p/>
+ * See <a href="http://developer.android.com/design/patterns/settings.html">
+ * Android Design: Settings</a> for design guidelines and the <a
+ * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
+ * API Guide</a> for more information on developing a Settings UI.
+ */
+public class SettingsActivity extends PreferenceActivity
+{
+    /**
+     * Determines whether to always show the simplified settings UI, where
+     * settings are presented in a single list. When false, settings are shown
+     * as a master/detail two-pane view on tablets. When true, a single pane is
+     * shown on tablets.
+     */
+    private static final boolean ALWAYS_SIMPLE_PREFS = false;
+
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState)
+    {
+        super.onPostCreate(savedInstanceState);
+
+        setupSimplePreferencesScreen();
+    }
+
+    /**
+     * Shows the simplified settings UI if the device configuration if the
+     * device configuration dictates that a simplified, single-pane UI should be
+     * shown.
+     */
+    private void setupSimplePreferencesScreen()
+    {
+        if (!isSimplePreferences(this))
+        {
+            return;
+        }
+
+        // In the simplified UI, fragments are not used at all and we instead
+        // use the older PreferenceActivity APIs.
+
+        // Add 'simulation' preferences.
+        addPreferencesFromResource(R.xml.pref_simulation);
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onIsMultiPane()
+    {
+        return isXLargeTablet(this) && !isSimplePreferences(this);
+    }
+
+    /**
+     * Helper method to determine if the device has an extra-large screen. For
+     * example, 10" tablets are extra-large.
+     */
+    private static boolean isXLargeTablet(Context context)
+    {
+        return (context.getResources().getConfiguration().screenLayout
+                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
+    }
+
+    /**
+     * Determines whether the simplified settings UI should be shown. This is
+     * true if this is forced via {@link #ALWAYS_SIMPLE_PREFS}, or the device
+     * doesn't have newer APIs like {@link PreferenceFragment}, or the device
+     * doesn't have an extra-large screen. In these cases, a single-pane
+     * "simplified" settings UI should be shown.
+     */
+    private static boolean isSimplePreferences(Context context)
+    {
+        return ALWAYS_SIMPLE_PREFS
+                || Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
+                || !isXLargeTablet(context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public void onBuildHeaders(List<Header> target)
+    {
+        if (!isSimplePreferences(this))
+        {
+            loadHeadersFromResource(R.xml.pref_headers, target);
+        }
+    }
+
+    /**
+     * A preference value change listener that updates the preference's summary
+     * to reflect its new value.
+     */
+    private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener()
+    {
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object value)
+        {
+            String stringValue = value.toString();
+                // For all other preferences, set the summary to the value's
+                // simple string representation.
+            preference.setSummary(stringValue);
+
+            return true;
+        }
+    };
+
+    /**
+     * Binds a preference's summary to its value. More specifically, when the
+     * preference's value is changed, its summary (line of text below the
+     * preference title) is updated to reflect the value. The summary is also
+     * immediately updated upon calling this method. The exact display format is
+     * dependent on the type of preference.
+     *
+     * @see #sBindPreferenceSummaryToValueListener
+     */
+    private static void bindPreferenceSummaryToValue(Preference preference)
+    {
+        // Set the listener to watch for value changes.
+        preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+
+        // Trigger the listener immediately with the preference's
+        // current value.
+        sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
+                PreferenceManager
+                        .getDefaultSharedPreferences(preference.getContext())
+                        .getString(preference.getKey(), ""));
+    }
+
+    /**
+     * This fragment shows simulation preferences only. It is used when the
+     * activity is showing a two-pane settings UI.
+     */
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class SimulationPreferenceFragment extends PreferenceFragment
+    {
+        @Override
+        public void onCreate(Bundle savedInstanceState)
+        {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_simulation);
+
+            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
+            // to their values. When their values change, their summaries are
+            // updated to reflect the new value, per the Android Design
+            // guidelines.
+            bindPreferenceSummaryToValue(findPreference("example_text"));
+            bindPreferenceSummaryToValue(findPreference("example_list"));
+        }
+    }
+
+}
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
new file mode 100644
index 0000000..5f30a66
--- /dev/null
+++ b/app/src/main/res/drawable/button.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#ffff843b" />
+            <stroke
+                android:width="1dp"
+                android:color="#222222" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#FF5C28"
+                android:endColor="#FF7549"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#ffd43900" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 743015c..4d66f99 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -181,7 +181,9 @@
             android:layout_below="@+id/text_layer"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
-            android:text="@string/button_crypt"/>
+            android:text="@string/button_crypt"
+            android:background="@drawable/button"
+            />
         </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 59ac26d..5a23c78 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -7,11 +7,15 @@
         android:orderInCategory="100"
         android:showAsAction="never" />
     <item android:id="@+id/action_reset"
-        android:orderInCategory="98"
+        android:orderInCategory="97"
         android:showAsAction="ifRoom"
         android:title="@string/action_reset" />
     <item android:id="@+id/action_choose_ringstellung"
         android:title="@string/action_choose_ringsettings"
-        android:orderInCategory="99"
+        android:orderInCategory="98"
         android:showAsAction="never" />
+    <item android:id="@+id/action_settings"
+          android:title="@string/action_settings"
+          android:orderInCategory="99"
+          android:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6615adb..8bd8f50 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_name">EnigmAndroid</string>
     <string name="action_version">Version</string>
     <string name="action_reset">Zurücksetzen</string>
-    <string name="action_settings">Version</string>
+    <string name="action_settings">Einstellungen</string>
     <string name="action_choose_ringsettings">Ringstellung</string>
     <string name="message_choose_ringsettings">Wähle die Ringstellungen für die Walzen:</string>
     <string name="hint_enigma_type_here">Hier Tippen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6e77ec..0df2e9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="action_version">Version</string>
     <string name="action_reset">Reset</string>
     <string name="action_choose_ringsettings">Ringsettings</string>
+    <string name="action_settings">Settings</string>
     <string name="message_choose_ringsettings">Choose ringsettings for the rotors:</string>
     <string name="hint_enigma_type_here">Type here</string>
     <string name="hint_enigma_code">EnigmaCode</string>
diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
new file mode 100644
index 0000000..bcb6a47
--- /dev/null
+++ b/app/src/main/res/values/strings_activity_settings.xml
@@ -0,0 +1,14 @@
+<resources>
+    <string name="title_activity_settings">Settings</string>
+
+    <!-- Strings related to Settings -->
+
+    <!-- Settings for simulation -->
+    <string name="pref_header_simulation">Simulation</string>
+
+    <string name="pref_title_simulate_anomaly">Simulate Anomaly</string>
+    <string name="pref_description_simulate_anomaly">The double step anomaly causes the middle rotor
+        to rotate twice, if one step from turnover point.
+    </string>
+
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ff6c9d2..8e64f09 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    <style name="AppTheme" parent="android:Theme.Holo">
         <!-- Customize your theme here. -->
     </style>
 
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
new file mode 100644
index 0000000..00a087e
--- /dev/null
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -0,0 +1,9 @@
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- These settings headers are only used on tablets. -->
+
+    <header
+        android:fragment="de.vanitasvitae.enigmandroid.SettingsActivity$SimulationPreferenceFragment"
+        android:title="@string/pref_header_simulation"/>
+
+</preference-headers>
diff --git a/app/src/main/res/xml/pref_simulation.xml b/app/src/main/res/xml/pref_simulation.xml
new file mode 100644
index 0000000..5b4d4a1
--- /dev/null
+++ b/app/src/main/res/xml/pref_simulation.xml
@@ -0,0 +1,8 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <CheckBoxPreference
+        android:key="example_checkbox"
+        android:title="@string/pref_title_simulate_anomaly"
+        android:summary="@string/pref_description_simulate_anomaly"
+        android:defaultValue="true" />
+</PreferenceScreen>
diff --git a/build.gradle b/build.gradle
index a75fc81..d3ff69d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
new file mode 100644
index 0000000..0497f23
--- /dev/null
+++ b/build/intermediates/dex-cache/cache.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<items version="2" >
+
+    <item
+        jar="/home/vanitas/androidstudio/EnigmAndroid/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8">
+        <dex dex="/home/vanitas/androidstudio/EnigmAndroid/app/build/intermediates/pre-dexed/debug/classes-75e34429d0c1bdc3b913e7df81fd900dd0cdc752.jar" />
+    </item>
+    <item
+        jar="/media/Daten/android-studio/android-sdk-linux/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35">
+        <dex dex="/home/vanitas/androidstudio/EnigmAndroid/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-f415c71037f6d951d1deff3566498fa2a465e206.jar" />
+    </item>
+    <item
+        jar="/home/vanitas/androidstudio/EnigmAndroid/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/libs/internal_impl-21.0.3.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03">
+        <dex dex="/home/vanitas/androidstudio/EnigmAndroid/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-b733ddfc406962ef118cbdff110aa44d9938bd94.jar" />
+    </item>
+
+</items>
diff --git a/build/intermediates/model_data.bin b/build/intermediates/model_data.bin
index 092fdf568a018f2565c570a8576f8c18dc0e0127..e400526874babc44230800a3510a3413a5c1bfa3 100644
GIT binary patch
literal 66966
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

delta 5459
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
PzUyflXa=y~93uY>6kEZZ

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e61d1f..0497007 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Feb 24 19:07:06 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/local.properties b/local.properties
index 20d199a..9b5e2d0 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,11 @@
 ## This file is automatically generated by Android Studio.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
 #
-# This file should *NOT* be checked into Version Control Systems,
+# This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/media/Daten/android-studio/sdk
\ No newline at end of file
+#Tue Feb 24 18:25:34 CET 2015
+sdk.dir=/media/Daten/android-studio/android-sdk-linux