diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/key_server_editor.xml | 52 | ||||
-rw-r--r-- | res/layout/key_server_preference.xml | 115 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | res/xml/apg_preferences.xml | 5 |
4 files changed, 175 insertions, 0 deletions
diff --git a/res/layout/key_server_editor.xml b/res/layout/key_server_editor.xml new file mode 100644 index 000000000..e4c25b316 --- /dev/null +++ b/res/layout/key_server_editor.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<org.thialfihar.android.apg.ui.widget.KeyServerEditor + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:orientation="horizontal" + android:layout_marginLeft="3dip"> + + <EditText + android:id="@+id/server" + android:layout_weight="1" + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:inputType="textUri"/> + + <ImageButton + android:id="@+id/delete" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/MinusButton" + android:layout_gravity="center_vertical" + android:layout_marginRight="3dip"/> + + </LinearLayout> + + <View + android:id="@+id/separator" + android:layout_width="fill_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider"/> + +</org.thialfihar.android.apg.ui.widget.KeyServerEditor> diff --git a/res/layout/key_server_preference.xml b/res/layout/key_server_preference.xml new file mode 100644 index 000000000..2f5645f62 --- /dev/null +++ b/res/layout/key_server_preference.xml @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <LinearLayout + android:id="@+android:id/text_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical"> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16sp" + android:layout_marginRight="6sp" + android:layout_marginTop="6sp" + android:layout_marginBottom="6sp" + android:layout_weight="1" + android:focusable="true" + android:background="@android:drawable/menuitem_background"> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:focusable="true" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:id="@+id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignLeft="@android:id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:maxLines="2" /> + + </RelativeLayout> + + <ImageView + android:id="@+id/add" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="4dip" + android:layout_marginRight="6dip" + android:layout_gravity="center_vertical" + android:clickable="true" + style="@style/PlusButton"/> + + </LinearLayout> + + <View + android:id="@+id/separator" + android:layout_width="fill_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider"/> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/editors" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"/> + + </ScrollView> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + style="@android:style/ButtonBar"> + + <Button + android:text="@android:string/ok" + android:id="@+id/btn_ok" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + <Button + android:text="@android:string/cancel" + android:id="@+id/btn_cancel" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + </LinearLayout> + +</LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 472e43770..dabade473 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -29,6 +29,7 @@ <string name="title_createKey">Create Key</string> <string name="title_editKey">Edit Key</string> <string name="title_preferences">Preferences</string> + <string name="title_keyServerPreference">Key Server Preference</string> <string name="title_changePassPhrase">Change Pass Phrase</string> <string name="title_setPassPhrase">Set Pass Phrase</string> <string name="title_sendEmail">"Send Mail..."</string> @@ -111,6 +112,7 @@ <string name="label_fileCompression">File Compression</string> <string name="label_language">Language</string> <string name="label_forceV3Signature">Force V3 Signatures</string> + <string name="label_keyServers">Key Servers</string> <string name="noKeysSelected">Select</string> <string name="oneKeySelected">1 Selected</string> @@ -125,6 +127,7 @@ <string name="canSign">can sign</string> <string name="expired">expired</string> <string name="notValid">not valid</string> + <string name="nKeyServers">%s key server(s)</string> <!-- choice_lowerCase: capitalized first word, no punctuation --> <string name="choice_none">None</string> diff --git a/res/xml/apg_preferences.xml b/res/xml/apg_preferences.xml index aa2defc87..faa5f9e3f 100644 --- a/res/xml/apg_preferences.xml +++ b/res/xml/apg_preferences.xml @@ -34,6 +34,11 @@ android:entryValues="@array/pass_phrase_cache_ttl_values" android:title="@string/label_passPhraseCacheTtl" /> + <PreferenceScreen + android:persistent="false" + android:key="keyServers" + android:title="@string/label_keyServers" /> + </PreferenceCategory> <PreferenceCategory |