cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,026 Commits 1 Branch 0 Tags
2ebcc942d4a4faca97971b387d14c5ea1fcac16f
Commit Graph

99 Commits

Author SHA1 Message Date
Dominik Schürmann
82ee9d440b Use material overflow icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
 2015-09-17 16:24:20 +02:00
Vincent Breitmoser
ff2c552aa2 white share icon in log display activity 2015-09-17 16:17:32 +02:00
Vincent Breitmoser
bbbc8dfd86 multidecrypt: black share icon in bottom sheet 2015-09-17 16:17:17 +02:00
Dominik Schürmann
ce105d955f Add text icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
 2015-09-16 17:21:38 +02:00
Vincent Breitmoser
c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Kaladin Light
dd850e5c72 Fixes open-keychain/open-keychain#1515 
Move launcher icons to mipmap
 2015-09-03 13:25:09 -04:00
Vincent Breitmoser
2aa424dd4d linked: use link icon from octo set? not sure yet.. 2015-09-01 07:46:37 +02:00
Vincent Breitmoser
66b9c167d6 linked: update icon design of github l-id creation 2015-09-01 07:37:49 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
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
 2015-08-29 13:28:56 +02:00
Dominik Schürmann
cac0f8ec9e Prettify settings, rename some strings 2015-08-27 15:53:29 +02:00
Adithya Abraham Philip
93d66d39f7 changed orbot notification icons 2015-08-20 21:02:29 +05:30
Vincent Breitmoser
6565adc5cc keylist: show delete as icon in multi-select 2015-07-08 15:24:10 +02:00
Dominik Schürmann
0faf69e91f Subtle design improvements to yubikey dialog 2015-07-03 16:54:17 +02:00
Dominik Schürmann
8b2ae99412 Merge pull request #1387 from ishit/master 
Add visual element to verify the re-typed password. Refer #1357.
 2015-07-02 17:39:45 +02:00
Ishit
51ac309bcf Change PassphraseEditAgain status icons. 2015-07-02 20:13:50 +05:30
Adithya Abraham Philip
af3868d547 reworked keyserver preferences with recyclerview 2015-07-02 02:30:49 +05:30
Vincent Breitmoser
dce4503ac5 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-26 02:44:59 +02:00
Dominik Schürmann
8cd7e29540 New notify icon 2015-06-24 11:35:11 +02:00
moparisthebest
7366f14d32 New all-white status bar icon to fix issue #1356 2015-06-22 22:40:15 -04:00
Vincent Breitmoser
c80d331b96 fix overflow icon 2015-06-20 07:33:14 +02:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Vincent Breitmoser
b4aec3114d Merge branch 'development' into linked-identities 
Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-04-24 14:18:01 +02:00
Vincent Breitmoser
dc8b04a793 more linked id ui fine tuning 2015-03-26 16:30:49 +01:00
Vincent Breitmoser
aa6d0dd867 some linked id ui fine tuning 2015-03-26 13:53:43 +01:00
Vincent Breitmoser
f9ef1160ca Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-24 15:29:58 +01:00
Vincent Breitmoser
04c7639a5a split up wait/action yubikey fragments 2015-03-21 22:18:58 +01:00
Kent
8d6d4328f2 Implemented #1162: Invoke NFC in Advanced View 
- Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes
 - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks
 - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment.
 - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
 2015-03-20 06:31:18 +08:00
Vincent Breitmoser
538be96e61 work on certification ui 2015-03-15 22:10:05 +01:00
Dominik Schürmann
bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik Schürmann
67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Dominik Schürmann
72c18734ad Redesign of encrypt activites finished 2015-03-09 16:03:58 +01:00
Dominik Schürmann
c50dceab32 Improve icons 2015-03-09 13:27:24 +01:00
Dominik Schürmann
d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann
18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Dominik Schürmann
7c8f338297 Use material save icon 2015-03-04 20:57:11 +01:00
Dominik Schürmann
bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development 
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2015-03-04 20:54:11 +01:00
Dominik Schürmann
484a9371b7 Remove help button for now 2015-03-04 20:40:55 +01:00
Dominik Schürmann
2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann
de31fcc45f Partially fix file names 2015-03-04 19:04:15 +01:00
jiangkai
f186199017 delete holo icons 2015-03-03 12:17:11 -08:00
jiangkai
ba1cd87d39 download new material design icons 2015-03-03 10:36:38 -08:00
Adithya Abraham Philip
99ff9d2340 merged dialog 2015-02-26 22:26:40 +05:30
Dominik Schürmann
1210a80a96 Remove old Holo design resources 2015-02-26 17:37:28 +01:00
Adithya Abraham Philip
ec353b0c39 initial Log Display function 2015-02-26 21:58:25 +05:30
Dominik Schürmann
b521162ef0 Invoke NFC button 2015-02-25 20:50:34 +01:00
Dominik Schürmann
0931c7742b Other icon for key exchange 2015-02-25 20:20:39 +01:00
Dominik Schürmann
4ea59f79cc Use material icon for safeslinger 2015-02-25 15:18:00 +01:00
Dominik Schürmann
fa92ceeae3 Toolbar: qr code in header, cleanup of fragment 2015-02-25 13:49:21 +01:00
Dominik Schürmann
430ba2f777 Bigger status icon in key view 2015-02-25 11:29:46 +01:00