Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[android] Disable Conversation Enter Transition for Samsung 7 devices

Closes #1310

See merge request briar/briar!1023
This commit is contained in:
akwizgran
2018-12-19 11:32:51 +00:00
parent 6fdab959b1 c8487483ff
commit 684c64a1d9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
View File

@@ -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.logException;
import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.bramble.util.LogUtils.now;
import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
import static org.briarproject.briar.android.util.UiUtils.isSamsung7;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
@@ -114,7 +115,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
ContactId contactId = item.getContact().getId(); ContactId contactId = item.getContact().getId();
i.putExtra(CONTACT_ID, contactId.getInt()); i.putExtra(CONTACT_ID, contactId.getInt());
if (SDK_INT >= 23) { if (SDK_INT >= 23 && !isSamsung7()) {
ContactListItemViewHolder holder = ContactListItemViewHolder holder =
(ContactListItemViewHolder) list (ContactListItemViewHolder) list
.getRecyclerView() .getRecyclerView()

3
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
View File

@@ -258,7 +258,8 @@ public class UiUtils {
} }
public static boolean isSamsung7() { 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) { public static void setFilterTouchesWhenObscured(View v, boolean filter) {