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

some more work on supertoast and result parcel stuff

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-07-27 00:46:38 +02:00
parent 8132b9ac74
commit a8782272b3
15 changed files with 87 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenKeychain/src/main/res/layout/edit_key_activity.xml
View File

@@ -1,46 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:orientation="vertical" >
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp" >
<include layout="@layout/notify_area"/>
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp"
android:text="@string/label_passphrase" />
<FrameLayout
android:id="@+id/edit_key_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
<CheckBox
android:id="@+id/edit_key_no_passphrase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_no_passphrase" />
<Button
android:id="@+id/edit_key_btn_change_passphrase"
android:layout_width="match_parent"
android:layout_height="60dp"
android:padding="4dp"
android:text="@string/btn_set_passphrase"
android:drawableLeft="@drawable/ic_action_edit"
android:background="@drawable/button_edgy" />
<LinearLayout
android:id="@+id/edit_key_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

13
OpenKeychain/src/main/res/layout/edit_key_activity_new.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/edit_key_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</LinearLayout>

15
OpenKeychain/src/main/res/layout/key_list_activity.xml
View File

@@ -2,16 +2,19 @@
<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/card_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
android:layout_height="match_parent">
<include layout="@layout/key_list_content"/>
<include layout="@layout/notify_area"/>
<include layout="@layout/drawer_list" />
<include layout="@layout/key_list_content"/>
<include layout="@layout/drawer_list" />
</LinearLayout>
</android.support.v4.widget.FixedDrawerLayout>

1
OpenKeychain/src/main/res/layout/notify_area.xml
View File

@@ -6,7 +6,6 @@
android:id="@+id/card_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/emphasis"
android:orientation="vertical" />
</merge>

6
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -4,11 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/card_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
<include layout="@layout/notify_area"/>
<TextView
android:layout_width="match_parent"