From f8d6b0bb467cf126b3e1bf295f584b533280ebef Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 11 Nov 2015 19:26:57 +0100
Subject: passdialog: switch to ViewAnimator

---
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index a2e6af27c..cd6b3e87b 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
     android:paddingLeft="24dp"
     android:paddingRight="24dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    custom:initialView="0">
 
     <LinearLayout
-        android:id="@+id/input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -34,7 +36,6 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/progress"
         android:layout_centerInParent="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -57,4 +58,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
\ No newline at end of file
-- 
cgit v1.2.3


From 840d57bf3b2c91f63f0df9d8988c16eb467b4a29 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 13 Nov 2015 16:56:35 +0100
Subject: passphraseactivity: add inline spinner to password dialog

---
 .../src/main/res/layout/passphrase_dialog.xml      | 22 ++++++++++++++++++++++
 OpenKeychain/src/main/res/layout/simple_item.xml   | 16 ++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/simple_item.xml

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

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index cd6b3e87b..fe09fb405 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -4,6 +4,7 @@
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
     android:paddingLeft="24dp"
@@ -33,6 +34,27 @@
             android:ems="10"
             android:layout_gravity="center_horizontal" />
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_vertical"
+            android:layout_margin="6dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Remember for "
+                android:textAppearance="@android:style/TextAppearance.Medium" />
+
+            <org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner
+                android:id="@+id/ttl_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner>
+
+        </LinearLayout>
+
     </LinearLayout>
 
     <LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/simple_item.xml b/OpenKeychain/src/main/res/layout/simple_item.xml
new file mode 100644
index 000000000..9a7bc58e3
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/simple_item.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/simple_item_text"
+        android:textAppearance="@android:style/TextAppearance.Medium"
+        tools:text="itemtext" />
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 31cc083163c634ac1f11d7aa22c679cda24ce892 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 16 Nov 2015 00:48:18 +0100
Subject: passdialog: seconds field and some minor layout issues

---
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 2 +-
 OpenKeychain/src/main/res/layout/simple_item.xml       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index fe09fb405..af05a3da4 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center_vertical"
-            android:layout_margin="6dp">
+            android:layout_margin="8dp">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/simple_item.xml b/OpenKeychain/src/main/res/layout/simple_item.xml
index 9a7bc58e3..45033a6e0 100644
--- a/OpenKeychain/src/main/res/layout/simple_item.xml
+++ b/OpenKeychain/src/main/res/layout/simple_item.xml
@@ -5,12 +5,13 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center">
+    android:gravity="center_vertical">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/simple_item_text"
         android:textAppearance="@android:style/TextAppearance.Medium"
+        android:padding="8dp"
         tools:text="itemtext" />
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 1754a88ac39e061dd36afd72f8a04e8d5e59751c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 17 Nov 2015 00:58:22 +0100
Subject: inline-ttl: create ttl choice customization setting activity

---
 .../src/main/res/layout/settings_cache_ttl.xml     | 71 ++++++++++++++++++++++
 .../res/layout/settings_cache_ttl_fragment.xml     |  7 +++
 .../main/res/layout/settings_cache_ttl_item.xml    | 36 +++++++++++
 OpenKeychain/src/main/res/values/arrays.xml        | 28 ---------
 OpenKeychain/src/main/res/values/strings.xml       | 12 +++-
 .../src/main/res/xml/passphrase_preferences.xml    |  6 +-
 6 files changed, 127 insertions(+), 33 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
 create mode 100644 OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml

(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
new file mode 100644
index 000000000..2b0a3d7eb
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            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"/>
+
+    <FrameLayout
+        android:id="@+id/settings_cache_ttl_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml
new file mode 100644
index 000000000..4a34bc5bc
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.RecyclerView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/cache_ttl_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
new file mode 100644
index 000000000..039f07b24
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="?selectableItemBackground">
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/ttl_selected"
+        android:layout_margin="8dp"
+        />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/ttl_title"
+        android:layout_weight="1"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textStyle="bold"
+        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/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml
index 393a1e091..584d773b7 100644
--- a/OpenKeychain/src/main/res/values/arrays.xml
+++ b/OpenKeychain/src/main/res/values/arrays.xml
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="passphrase_cache_ttl_entries" translatable="false">
-        <item>@string/choice_15secs</item>
-        <item>@string/choice_1min</item>
-        <item>@string/choice_3mins</item>
-        <item>@string/choice_5mins</item>
-        <item>@string/choice_10mins</item>
-        <item>@string/choice_20mins</item>
-        <item>@string/choice_40mins</item>
-        <item>@string/choice_1hour</item>
-        <item>@string/choice_2hours</item>
-        <item>@string/choice_4hours</item>
-        <item>@string/choice_8hours</item>
-        <item>@string/choice_forever</item>
-    </string-array>
-    <string-array name="passphrase_cache_ttl_values" translatable="false">
-        <item>15</item>
-        <item>60</item>
-        <item>180</item>
-        <item>300</item>
-        <item>600</item>
-        <item>1200</item>
-        <item>2400</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>14400</item>
-        <item>28800</item>
-        <item>-1</item>
-    </string-array>
     <string-array name="pref_proxy_type_entries" translatable="false">
         <item>@string/pref_proxy_type_choice_http</item>
         <item>@string/pref_proxy_type_choice_socks</item>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index afda3c3c3..076ff0736 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="title_preferences">"Settings"</string>
     <string name="title_api_registered_apps">"Apps"</string>
     <string name="title_key_server_preference">"OpenPGP keyservers"</string>
+    <string name="title_cache_ttl_preference">"Customize 'Remember' Choices"</string>
     <string name="title_change_passphrase">"Change Password"</string>
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
@@ -157,7 +158,7 @@
     <string name="label_encryption_algorithm">"Encryption algorithm"</string>
     <string name="label_hash_algorithm">"Hash algorithm"</string>
     <string name="label_symmetric">"Encrypt with password"</string>
-    <string name="label_passphrase_cache_ttl">"Remember time"</string>
+    <string name="label_passphrase_cache_ttl">"Customize 'Remember' Choices"</string>
     <string name="label_passphrase_cache_subs">"Remember passwords by subkey"</string>
     <string name="label_message_compression">"Text compression"</string>
     <string name="label_file_compression">"File compression"</string>
@@ -1709,5 +1710,14 @@
     <string name="title_edit_identities">"Edit Identities"</string>
     <string name="title_edit_subkeys">"Edit Subkeys"</string>
     <string name="btn_search_for_query">"Search for\n'%s'"</string>
+    <string name="cache_ttl_five_minutes">"Five Minutes"</string>
+    <string name="cache_ttl_one_hour">"One Hour"</string>
+    <string name="cache_ttl_three_hours">"Three Hours"</string>
+    <string name="cache_ttl_one_day">"One Day"</string>
+    <string name="cache_ttl_three_days">"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_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>
 
 </resources>
diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
index 75f293c43..25bdf3a3d 100644
--- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -1,8 +1,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-        android:entries="@array/passphrase_cache_ttl_entries"
-        android:entryValues="@array/passphrase_cache_ttl_values"
-        android:key="passphraseCacheTtl"
+    <PreferenceScreen
+        android:key="passphraseCacheTtls"
         android:persistent="false"
         android:title="@string/label_passphrase_cache_ttl" />
     <CheckBoxPreference
-- 
cgit v1.2.3


From 7eafe5d1e81fe3f72e66b600736e55f8eb21f038 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 18 Nov 2015 19:23:40 +0100
Subject: inline-ttl: support "screen off" in preference

---
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml |  2 +-
 OpenKeychain/src/main/res/values/strings.xml           | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index af05a3da4..81840f67f 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -44,7 +44,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Remember for "
+                android:text="@string/remember"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
             <org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 076ff0736..4a0640536 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1710,14 +1710,16 @@
     <string name="title_edit_identities">"Edit Identities"</string>
     <string name="title_edit_subkeys">"Edit Subkeys"</string>
     <string name="btn_search_for_query">"Search for\n'%s'"</string>
-    <string name="cache_ttl_five_minutes">"Five Minutes"</string>
-    <string name="cache_ttl_one_hour">"One Hour"</string>
-    <string name="cache_ttl_three_hours">"Three Hours"</string>
-    <string name="cache_ttl_one_day">"One Day"</string>
-    <string name="cache_ttl_three_days">"Three Days"</string>
+    <string name="cache_ttl_lock_screen">"until Screen Off"</string>
+    <string name="cache_ttl_five_minutes">"for Five Minutes"</string>
+    <string name="cache_ttl_one_hour">"for One Hour"</string>
+    <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_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>
 
 </resources>
-- 
cgit v1.2.3


From 65071d42d006b1b655226e94d59fdc190ef722b4 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 18 Nov 2015 19:56:45 +0100
Subject: inline-ttl: some layout fine tuning

---
 OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 1 +
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index ab1bf3d4a..3245fd28b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -91,6 +91,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/md_black_1000"
                 android:text="@string/label_asymmetric_from"
                 android:paddingRight="8dp"/>
 
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index 81840f67f..693829352 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:paddingTop="16dp"
-    android:paddingBottom="16dp"
     android:paddingLeft="24dp"
     android:paddingRight="24dp"
     android:orientation="vertical"
@@ -41,10 +40,12 @@
             android:gravity="center_vertical"
             android:layout_margin="8dp">
 
+            <!-- paddingBottom for spinner alignment -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/remember"
+                android:paddingBottom="1dp"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
             <org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner
-- 
cgit v1.2.3


From f2ef65ac37bb296392dc1e9ed327dbb595ebf180 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Nov 2015 19:04:02 +0100
Subject: add method to skip caching

---
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index 693829352..7252effad 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -38,7 +38,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center_vertical"
-            android:layout_margin="8dp">
+            android:layout_margin="8dp"
+            android:id="@+id/remember_layout">
 
             <!-- paddingBottom for spinner alignment -->
             <TextView
-- 
cgit v1.2.3


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