diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_app_register_activity.xml | 53 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_app_settings_activity.xml | 37 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml | 50 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_apps_list_activity.xml (renamed from OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml) | 2 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_register_activity.xml | 102 |
5 files changed, 141 insertions, 103 deletions
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml new file mode 100644 index 000000000..b8b668681 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <fragment + android:id="@+id/api_app_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> + + <LinearLayout + android:id="@+id/register_crypto_consumer_register_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="3dip" > + + <TextView + android:id="@+id/register_crypto_consumer_question" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Package TODO requests permanent access to OpenPGP Keychain\'s API. Allow permanent access?" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <LinearLayout + android:id="@+id/register_crypto_consumer_register_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="3dip" > + + <Button + android:id="@+id/register_crypto_consumer_disallow" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="Disallow access" /> + + <Button + android:id="@+id/register_crypto_consumer_allow" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="Allow access" /> + </LinearLayout> + </LinearLayout> + + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml new file mode 100644 index 000000000..e25a110cc --- /dev/null +++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <fragment + android:id="@+id/api_app_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> + + <LinearLayout + android:id="@+id/register_crypto_consumer_edit_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="3dip" > + + <Button + android:id="@+id/register_crypto_consumer_disallow" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="Revoke access" /> + + <Button + android:id="@+id/register_crypto_consumer_allow" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="Save" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml new file mode 100644 index 000000000..3763d3198 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<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:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="3dip" > + + <TextView + android:id="@+id/register_crypto_consumer_select_key" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="Select key" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Button + android:id="@+id/register_crypto_consumer_select_key_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="TD Select priv key" /> + </LinearLayout> + + <Button + android:id="@+id/api_app_settings_advanced_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="show advanced settings" /> + + <LinearLayout + android:id="@+id/api_app_settings_advanced" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <CheckBox + android:id="@+id/asciiArmour" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_asciiArmour" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml index a926ad1a8..e4657c107 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_list_activity.xml +++ b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml @@ -5,7 +5,7 @@ <fragment android:id="@+id/crypto_consumers_list_fragment" - android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsFragment" + android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/OpenPGP-Keychain/res/layout/api_register_activity.xml b/OpenPGP-Keychain/res/layout/api_register_activity.xml deleted file mode 100644 index 3af373956..000000000 --- a/OpenPGP-Keychain/res/layout/api_register_activity.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="3dip" > - - <TextView - android:id="@+id/register_crypto_consumer_select_key" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:text="Select key" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Button - android:id="@+id/register_crypto_consumer_select_key_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="TD Select priv key" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <CheckBox - android:id="@+id/asciiArmour" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_asciiArmour" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/register_crypto_consumer_register_layout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="3dip" > - - <TextView - android:id="@+id/register_crypto_consumer_question" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Package TODO requests permanent access to OpenPGP Keychain\'s API. Allow permanent access?" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <LinearLayout - android:id="@+id/register_crypto_consumer_register_layout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="3dip" > - - <Button - android:id="@+id/register_crypto_consumer_disallow" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Disallow access" /> - - <Button - android:id="@+id/register_crypto_consumer_allow" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Allow access" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/register_crypto_consumer_edit_layout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="3dip" > - - <Button - android:id="@+id/register_crypto_consumer_disallow" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Revoke access" /> - - <Button - android:id="@+id/register_crypto_consumer_allow" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Save" /> - </LinearLayout> - -</LinearLayout>
\ No newline at end of file |