PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Add notify layouts to some activities

Browse source
This commit is contained in:
Dominik Schürmann 2014-07-31 21:29:45 +02:00
parent 38922f96a6
commit b9694ae9c5
4 changed files with 100 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
View file

@ -1,20 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <include layout="@layout/notify_area" />
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
android:orientation="vertical">
<fragment <LinearLayout
android:id="@+id/api_account_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:padding="16dp"
android:orientation="vertical">
</LinearLayout> <fragment
</ScrollView> android:id="@+id/api_account_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
</LinearLayout>

50
OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
View file

@ -1,33 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <include layout="@layout/notify_area" />
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
android:orientation="vertical">
<fragment <LinearLayout
android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" /> android:padding="16dp"
android:orientation="vertical">
<TextView <fragment
android:layout_width="match_parent" android:id="@+id/api_app_settings_fragment"
android:layout_height="wrap_content" android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
android:text="@string/api_settings_accounts" android:layout_width="match_parent"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" />
<FrameLayout <TextView
android:id="@+id/api_accounts_list_fragment" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:text="@string/api_settings_accounts"
android:orientation="vertical" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> <FrameLayout
</ScrollView> android:id="@+id/api_accounts_list_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</LinearLayout>
</ScrollView>
</LinearLayout>

3
OpenKeychain/src/main/res/layout/certify_key_activity.xml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<include layout="@layout/notify_area" /> <include layout="@layout/notify_area" />
<ScrollView xmlns:tools="http://schemas.android.com/tools" <ScrollView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">

93
OpenKeychain/src/main/res/layout/upload_key_activity.xml
View file

@ -1,55 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <include layout="@layout/notify_area" />
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical">
<TextView <LinearLayout
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_key_server" />
<Spinner
android:id="@+id/upload_key_keyserver"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:paddingLeft="16dp"
android:layout_marginTop="4dp" /> android:paddingRight="16dp"
android:orientation="vertical">
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginTop="14dp" android:layout_marginBottom="4dp"
android:text="@string/section_actions" android:layout_marginTop="14dp"
android:layout_weight="1" /> android:text="@string/section_key_server" />
<TextView <Spinner
android:id="@+id/upload_key_action_upload" android:id="@+id/upload_key_keyserver"
android:paddingLeft="8dp" android:layout_width="match_parent"
android:paddingRight="8dp" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="4dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginTop="4dp" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/btn_export_to_server"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_upload"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
</LinearLayout> <TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:text="@string/section_actions"
android:layout_weight="1" />
</ScrollView> <TextView
android:id="@+id/upload_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="match_parent"
android:text="@string/btn_export_to_server"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_upload"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
</LinearLayout>
</ScrollView>
</LinearLayout>