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
40 lines
1.4 KiB
XML
40 lines
1.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<resources>
|
|
|
|
<declare-styleable name="ToolableViewAnimator">
|
|
<attr name="initialView" format="integer" />
|
|
</declare-styleable>
|
|
|
|
<declare-styleable name="FoldableLinearLayout">
|
|
<attr name="foldedLabel" format="string" />
|
|
<attr name="unFoldedLabel" format="string" />
|
|
</declare-styleable>
|
|
|
|
<declare-styleable name="AspectRatioImageView">
|
|
<attr name="aspectRatio" format="float" />
|
|
<attr name="aspectRatioEnabled" format="boolean" />
|
|
<attr name="dominantMeasurement">
|
|
<enum name="width" value="0" />
|
|
<enum name="height" value="1" />
|
|
</attr>
|
|
</declare-styleable>
|
|
|
|
<!-- Taken from Matt Allen Password Strength View
|
|
https://github.com/matt-allen/android-password-strength-indicator -->
|
|
<declare-styleable name="PasswordStrengthView">
|
|
<attr name="strength" format="enum">
|
|
<enum name="weak" value="0" />
|
|
<enum name="medium" value="1" />
|
|
<enum name="strong" value="2" />
|
|
</attr>
|
|
<attr name="showGuides" format="boolean" />
|
|
<attr name="color_fail" format="color" />
|
|
<attr name="color_weak" format="color" />
|
|
<attr name="color_strong" format="color" />
|
|
</declare-styleable>
|
|
|
|
<declare-styleable name="PrefixedEditText">
|
|
<attr name="prefix" format="string" />
|
|
</declare-styleable>
|
|
|
|
</resources> |