diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-12-14 18:22:03 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-12-14 18:22:03 +0100 |
commit | be4e3a10b008dfb33caf593b6e68bb7018c2a41c (patch) | |
tree | 781e16e6964cc2482f9eeac7e123659b5bafded8 /APG-API-Demo/res | |
parent | 2dcaad3d3b6f8757f01e4abd2295431f24cdfed5 (diff) | |
download | open-keychain-be4e3a10b008dfb33caf593b6e68bb7018c2a41c.tar.gz open-keychain-be4e3a10b008dfb33caf593b6e68bb7018c2a41c.tar.bz2 open-keychain-be4e3a10b008dfb33caf593b6e68bb7018c2a41c.zip |
AIDL API changes
Diffstat (limited to 'APG-API-Demo/res')
-rw-r--r-- | APG-API-Demo/res/layout/aidl_demo2.xml | 40 | ||||
-rw-r--r-- | APG-API-Demo/res/xml/base_preference.xml | 13 |
2 files changed, 48 insertions, 5 deletions
diff --git a/APG-API-Demo/res/layout/aidl_demo2.xml b/APG-API-Demo/res/layout/aidl_demo2.xml new file mode 100644 index 000000000..73abd9b5c --- /dev/null +++ b/APG-API-Demo/res/layout/aidl_demo2.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <Button + android:id="@+id/aidl_demo_select_encryption_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="selectEncryptionKeysOnClick" + android:text="Select encryption key(s)" /> + + <EditText + android:id="@+id/aidl_demo_keyrings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="keyrings output" + android:textAppearance="@android:style/TextAppearance.Small" /> + + <Button + android:id="@+id/aidl_demo_get_keyrings_strings" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="getKeyringsStringsOnClick" + android:text="getKeyrings as Strings" /> + + <Button + android:id="@+id/aidl_demo_get_keyrings_bytes" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="getKeyringsBytesOnClick" + android:text="getKeyringsBytes" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/APG-API-Demo/res/xml/base_preference.xml b/APG-API-Demo/res/xml/base_preference.xml index 3fcd036e2..c9a34efd1 100644 --- a/APG-API-Demo/res/xml/base_preference.xml +++ b/APG-API-Demo/res/xml/base_preference.xml @@ -6,15 +6,18 @@ android:key="intent_demo" android:title="Intent Demo" /> </PreferenceCategory> - <PreferenceCategory android:title="AIDL" > - <Preference - android:key="aidl_demo" - android:title="AIDL Demo" /> - </PreferenceCategory> <PreferenceCategory android:title="Content Provider" > <Preference android:key="content_provider_demo" android:title="Content Provider Demo" /> </PreferenceCategory> + <PreferenceCategory android:title="AIDL" > + <Preference + android:key="aidl_demo" + android:title="AIDL Demo (ACCESS_API permission)" /> + <Preference + android:key="aidl_demo2" + android:title="AIDL Demo (ACCESS_KEYS permission)" /> + </PreferenceCategory> </PreferenceScreen>
\ No newline at end of file |