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

Merge branch 'master' into improve-file-more

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
This commit is contained in:
mar-v-in
2014-08-01 05:29:40 +02:00
parent c71cdc1432 79f69f2fce
commit fc2a1f5838
25 changed files with 297 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
View File

@@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:text="Max Mustermann"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -52,7 +51,6 @@
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="max@musterman.com"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp" />
@@ -131,7 +129,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/title_create_key"
android:text="@string/btn_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawablePadding="8dp"

29
OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
View File

@@ -17,20 +17,28 @@
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:text="@string/create_key_text"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/create_key_text" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/label_user_id" />
<AutoCompleteTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:imeOptions="actionNext"
android:inputType="textPersonName"
android:hint="@string/label_name"
android:hint="@string/create_key_hint_full_name"
android:ems="10"
android:id="@+id/name" />
@@ -44,10 +52,17 @@
android:ems="10"
android:inputType="textEmailAddress" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_passphrase" />
<EditText
android:id="@+id/passphrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:inputType="textPassword"
android:hint="@string/label_passphrase"
@@ -117,7 +132,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/title_create_key"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawablePadding="8dp"

4
OpenKeychain/src/main/res/layout/first_time_activity.xml
View File

@@ -33,9 +33,10 @@
android:layout_weight="1"
android:text="@string/first_time_import_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_download"
android:drawableRight="@drawable/ic_action_collection"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
@@ -59,6 +60,7 @@
android:drawableRight="@drawable/ic_action_new_account"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />

4
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@@ -56,6 +56,7 @@
android:textSize="14sp"
android:text="@string/key_list_empty_button_create"
android:drawableLeft="@drawable/ic_action_new_account"
android:drawablePadding="8dp"
android:background="@drawable/button_edgy"/>
<TextView
@@ -73,7 +74,8 @@
android:layout_margin="4dp"
android:textSize="14sp"
android:text="@string/key_list_empty_button_import"
android:drawableLeft="@drawable/ic_action_download"
android:drawableLeft="@drawable/ic_action_collection"
android:drawablePadding="8dp"
android:background="@drawable/button_edgy" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/key_list_header.xml
View File

@@ -21,7 +21,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="8dp"
android:visibility="visible"
android:visibility="gone"
android:textColor="@android:color/darker_gray" />
</RelativeLayout>

24
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
View File

@@ -17,7 +17,6 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="4dp"
android:layout_marginTop="8dp"
android:text="@string/section_user_ids"
android:layout_weight="1" />
@@ -98,7 +97,6 @@
android:id="@+id/view_key_action_encrypt"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -111,6 +109,28 @@
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/view_key_action_update"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/key_view_action_update"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_download"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
</LinearLayout>
</ScrollView>

23
OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
View File

@@ -124,6 +124,29 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/view_key_action_upload"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/key_view_action_upload"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_upload"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:editable="false" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"