forked from upstream-mirrors/quik
Merge branch 'octoshrimpy:master' into widget_conversations_162
This commit is contained in:
@@ -98,6 +98,7 @@
|
||||
android:background="@drawable/message_only"
|
||||
android:gravity="start|center_vertical"
|
||||
android:minHeight="36dp"
|
||||
android:textIsSelectable="true"
|
||||
app:layout_constrainedWidth="true"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0"
|
||||
|
||||
@@ -92,6 +92,7 @@
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:gravity="start|center_vertical"
|
||||
android:minHeight="36dp"
|
||||
android:textIsSelectable="true"
|
||||
app:layout_constrainedWidth="true"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
|
||||
@@ -152,6 +152,15 @@
|
||||
app:title="@string/settings_delivery_title"
|
||||
app:widget="@layout/settings_switch_widget" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/unreadAtTop"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:icon="@drawable/ic_unreadattop_all_black_24dp"
|
||||
app:summary="@string/settings_unread_at_top_summary"
|
||||
app:title="@string/settings_unread_at_top_title"
|
||||
app:widget="@layout/settings_switch_widget" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/signature"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
Reference in New Issue
Block a user