From ae15b5dd0d7d57746c06a7a8c15e5d9dd14c858e Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 5 Jan 2016 01:20:28 +0100
Subject: inline-ttl: remove "default" setting

---
 .../src/main/res/layout/settings_cache_ttl.xml     | 38 ----------------------
 .../main/res/layout/settings_cache_ttl_item.xml    |  7 ----
 OpenKeychain/src/main/res/values/strings.xml       |  3 +-
 3 files changed, 1 insertion(+), 47 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
index 2b0a3d7eb..25ac33c5c 100644
--- a/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
+++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
@@ -20,44 +20,6 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/settings_cache_select_three"/>
 
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/setting_cache_select_default"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="12dp"
-            android:src="@drawable/ic_expand_more_black_24dp"
-            />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="12dp"
-            android:src="@drawable/ic_expand_more_black_24dp"
-            />
-
     </LinearLayout>
 
     <View style="@style/Divider"/>
diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
index 039f07b24..c0470288f 100644
--- a/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
+++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
@@ -26,11 +26,4 @@
         tools:text="One Hour"
         />
 
-    <RadioButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/ttl_default"
-        android:padding="4dp"
-        />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 4a0640536..3c77d82dd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1716,8 +1716,7 @@
     <string name="cache_ttl_three_hours">"for Three Hours"</string>
     <string name="cache_ttl_one_day">"for One Day"</string>
     <string name="cache_ttl_three_days">"for Three Days"</string>
-    <string name="settings_cache_select_three">"Pick up to three"</string>
-    <string name="setting_cache_select_default">"and one default"</string>
+    <string name="settings_cache_select_three">"Pick up to three."</string>
     <string name="settings_cache_ttl_at_least_one">"At least one item must be selected!"</string>
     <string name="settings_cache_ttl_max_three">"Can\'t select more than three items!"</string>
     <string name="remember">"Remember"</string>
-- 
cgit v1.2.3