TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-collapsing layout when scrolled from horiz recyclerview

Browse Source 
Fixes #7042
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-10-08 17:36:35 -07:00
parent 5a607918d2
commit 9fa4ba126b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/recipient_preference_activity.xml
View File

@ -75,6 +75,7 @@
android:padding="16dp" android:padding="16dp"
android:text="@string/recipient_preference_activity__shared_media" android:text="@string/recipient_preference_activity__shared_media"
android:visibility="gone" android:visibility="gone"
android:focusableInTouchMode="true"
style="?android:attr/preferenceCategoryStyle" style="?android:attr/preferenceCategoryStyle"
android:textColor="@color/textsecure_primary"/> android:textColor="@color/textsecure_primary"/>

2
res/layout/recipient_preference_photo_rail.xml
View File

@ -8,6 +8,6 @@
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:clipToPadding="false" android:clipToPadding="false"
android:nestedScrollingEnabled="true" android:nestedScrollingEnabled="false"
android:scrollbars="none"/> android:scrollbars="none"/>
</merge> </merge>

2
src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
View File

@ -51,7 +51,7 @@ public class ThreadPhotoRailView extends FrameLayout {
this.recyclerView = ViewUtil.findById(this, R.id.photo_list); this.recyclerView = ViewUtil.findById(this, R.id.photo_list);
this.recyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)); this.recyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
this.recyclerView.setItemAnimator(new DefaultItemAnimator()); this.recyclerView.setItemAnimator(new DefaultItemAnimator());
this.recyclerView.setNestedScrollingEnabled(true); this.recyclerView.setNestedScrollingEnabled(false);
} }
public void setListener(@Nullable OnItemClickedListener listener) { public void setListener(@Nullable OnItemClickedListener listener) {