Merge branch '318-conversation-avatar-animation' into 'master' (fb853453) · 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

fb853453

Commit fb853453 authored 8 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '318-conversation-avatar-animation' into 'master'

Disable Conversation Exit Transition and Animate Bulb

Works-around #318

See merge request !193

parents 0b67ec92 6e545d01

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/layout/contact_avatar_status.xml 2 additions, 3 deletions

briar-android/res/layout/contact_avatar_status.xml
briar-android/res/layout/list_item_contact.xml 4 additions, 5 deletions

briar-android/res/layout/list_item_contact.xml
briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java 5 additions, 0 deletions

.../briarproject/android/contact/BaseContactListAdapter.java
briar-android/src/org/briarproject/android/contact/ContactListAdapter.java 5 additions, 0 deletions

.../org/briarproject/android/contact/ContactListAdapter.java
briar-android/src/org/briarproject/android/contact/ContactListFragment.java 20 additions, 11 deletions

...org/briarproject/android/contact/ContactListFragment.java
briar-android/src/org/briarproject/android/contact/ConversationActivity.java 13 additions, 1 deletion

...rg/briarproject/android/contact/ConversationActivity.java
briar-android/src/org/briarproject/android/util/BriarRecyclerView.java 5 additions, 0 deletions

.../src/org/briarproject/android/util/BriarRecyclerView.java

with 54 additions and 20 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