Commit 684c64a1 authored by akwizgran's avatar akwizgran

Merge branch '1310-disable-enter-transition-for-samsung7' into 'master'

[android] Disable Conversation Enter Transition for Samsung 7 devices

Closes #1310

See merge request !1023
parents 6fdab959 c8487483
Pipeline #2929 passed with stage
in 9 minutes and 43 seconds
......@@ -57,6 +57,7 @@ import static org.briarproject.bramble.util.LogUtils.logDuration;
import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.bramble.util.LogUtils.now;
import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
import static org.briarproject.briar.android.util.UiUtils.isSamsung7;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
......@@ -114,7 +115,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
ContactId contactId = item.getContact().getId();
i.putExtra(CONTACT_ID, contactId.getInt());
if (SDK_INT >= 23) {
if (SDK_INT >= 23 && !isSamsung7()) {
ContactListItemViewHolder holder =
(ContactListItemViewHolder) list
.getRecyclerView()
......
......@@ -258,7 +258,8 @@ public class UiUtils {
}
public static boolean isSamsung7() {
return SDK_INT == 24 && MANUFACTURER.equalsIgnoreCase("Samsung");
return (SDK_INT == 24 || SDK_INT == 25) &&
MANUFACTURER.equalsIgnoreCase("Samsung");
}
public static void setFilterTouchesWhenObscured(View v, boolean filter) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment