Merge branch '504-define-and-design-primary-and-secondary-actions' into 'master' (7d1ddb6d) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7d1ddb6d

Commit 7d1ddb6d authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '504-define-and-design-primary-and-secondary-actions' into 'master'

Make dialog actions consistent

Closes #504

See merge request !430

parents f1371f1d 38f46a9c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/values/strings.xml 1 addition, 0 deletions

briar-android/res/values/strings.xml
briar-android/src/org/briarproject/android/contact/ConversationActivity.java 2 additions, 2 deletions

...rg/briarproject/android/contact/ConversationActivity.java
briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java 6 additions, 4 deletions

.../briarproject/android/panic/PanicPreferencesFragment.java
briar-android/src/org/briarproject/android/privategroup/reveal/RevealContactsActivity.java 1 addition, 1 deletion

...t/android/privategroup/reveal/RevealContactsActivity.java

with 10 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment