moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Dominik Schürmann 2014-07-30 01:07:10 +02:00
parent 43b8170a44
commit 9f9aa79066
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View File

@ -68,7 +68,8 @@ public class CreateKeyActivity extends ActionBarActivity {
transaction.setCustomAnimations(R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right); transaction.setCustomAnimations(R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right);
break; break;
case ANIM_TO_RIGHT: case ANIM_TO_RIGHT:
transaction.setCustomAnimations(R.anim.frag_slide_out_to_left, R.anim.frag_slide_in_from_right); transaction.setCustomAnimations(R.anim.frag_slide_out_to_left, R.anim.frag_slide_in_from_right,
R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right);
transaction.addToBackStack("back"); transaction.addToBackStack("back");
break; break;

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

@ -53,17 +53,38 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="max@musterman.com" android:text="max@musterman.com"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="32dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp" /> android:layout_marginLeft="8dp" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<CheckBox <CheckBox
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/create_key_upload" android:text="@string/create_key_upload"
android:id="@+id/create_key_upload" /> android:id="@+id/create_key_upload" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:text="Creating the key can take up to 3 Minutes, be patient!"
android:textColor="@color/result_orange"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/textView" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
@ -91,7 +112,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" style="@style/SelectableItem"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical" />
<View <View
android:layout_width="1dp" android:layout_width="1dp"