cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inline-ttl: remove "default" setting

Browse Source
This commit is contained in:
Vincent Breitmoser
2016-01-05 01:20:28 +01:00
parent f2ef65ac37
commit ae15b5dd0d
6 changed files with 7 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
View File

@@ -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"/>

7
OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
View File

@@ -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>

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>