a6e25e6448
Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
69 lines
2.5 KiB
XML
69 lines
2.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
xmlns:custom="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<LinearLayout
|
|
android:visibility="gone"
|
|
android:id="@+id/decrypt_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
tools:visibility="visible">
|
|
|
|
<ScrollView
|
|
android:fillViewport="true"
|
|
android:paddingTop="8dp"
|
|
android:layout_width="match_parent"
|
|
android:scrollbars="vertical"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1">
|
|
|
|
<TextView
|
|
android:id="@+id/decrypt_text_plaintext"
|
|
android:paddingLeft="16dp"
|
|
android:paddingRight="16dp"
|
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="top"
|
|
android:hint=""
|
|
tools:text="This is the plaintext"
|
|
android:textIsSelectable="true" />
|
|
|
|
</ScrollView>
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/decrypt_error_overlay"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
android:gravity="center_vertical"
|
|
android:visibility="gone">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
android:text="@string/decrypt_invalid_text"
|
|
android:padding="16dp"
|
|
android:layout_gravity="center"
|
|
android:textColor="@color/android_red_light" />
|
|
|
|
<Button
|
|
android:id="@+id/decrypt_error_overlay_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:background="@drawable/button_edgy"
|
|
android:textColor="@color/android_red_light"
|
|
android:text="@string/decrypt_invalid_button"
|
|
android:layout_gravity="center_horizontal" />
|
|
</LinearLayout>
|
|
|
|
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
|