diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-05 19:30:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-05 19:30:52 +0200 |
| commit | aa6f5118f5b88ed40e1318b59d47465bae6067df (patch) | |
| tree | c00db3802cd6258073b16d197b1bd2e8d2d7e975 /OpenPGP-Keychain-API/example-app/src/main/res | |
| parent | 5e4239a7b98a050b4312eee075f2fdac7f2b8af2 (diff) | |
| parent | db25433890cfc5bbf0200eb488076df23cb44866 (diff) | |
| download | open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.tar.gz open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.tar.bz2 open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.zip | |
Merge remote-tracking branch 'origin/master' into certs
A lot of things are completely broken, but it compiles and doesn't crash
right away. Good enough for me.
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
Diffstat (limited to 'OpenPGP-Keychain-API/example-app/src/main/res')
| -rw-r--r-- | OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml b/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml index 6c2ce1a7c..2b8e8016a 100644 --- a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml +++ b/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml @@ -46,6 +46,7 @@ android:scrollHorizontally="true" android:scrollbars="vertical" android:text="message" + android:hint="cleartext message" android:textAppearance="@android:style/TextAppearance.Small" /> </ScrollView> @@ -66,6 +67,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="ciphertext" + android:hint="ciphertext" android:textAppearance="@android:style/TextAppearance.Small" /> </ScrollView> @@ -104,5 +106,18 @@ android:layout_height="wrap_content" android:text="Decrypt and Verify" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Account ID:" + android:textAppearance="?android:attr/textAppearanceMedium" + android:id="@+id/textView" /> + + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Alice <alice@example.com>" + android:id="@+id/crypto_provider_demo_account" /> + </LinearLayout> </ScrollView>
\ No newline at end of file |