diff options
| author | tom79 <tschneider.ac@gmail.com> | 2019-05-04 18:28:55 +0200 |
|---|---|---|
| committer | tom79 <tschneider.ac@gmail.com> | 2019-05-04 18:28:55 +0200 |
| commit | 7d1bbe5e5e59358ad71299e4d268d34c560709f7 (patch) | |
| tree | c71da78b8782e7e70d093ae3bea44bfe1b6a8470 /app/src/main/res/layout | |
| parent | 1adfa71875224038c430872e87b3116442fbb24f (diff) | |
| parent | 658ab3c166d12259dc8c7bfefed262cdc158da31 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/fragment_settings_notifications.xml | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/app/src/main/res/layout/fragment_settings_notifications.xml b/app/src/main/res/layout/fragment_settings_notifications.xml index 299ae4679..2874eb9c6 100644 --- a/app/src/main/res/layout/fragment_settings_notifications.xml +++ b/app/src/main/res/layout/fragment_settings_notifications.xml @@ -165,11 +165,11 @@ android:orientation="horizontal" > <Button - android:id="@+id/sound_backup" + android:id="@+id/sound_poll" android:gravity="center" style="@style/Base.Widget.AppCompat.Button.Colored" android:tint="@android:color/white" - android:text="@string/channel_notif_backup" + android:text="@string/channel_notif_poll" android:maxLines="1" android:layout_width="0dp" android:layout_weight="1" @@ -185,6 +185,27 @@ android:layout_weight="1" android:layout_height="wrap_content"/> </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <Button + android:id="@+id/sound_backup" + android:gravity="center" + style="@style/Base.Widget.AppCompat.Button.Colored" + android:tint="@android:color/white" + android:text="@string/channel_notif_backup" + android:maxLines="1" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content"/> + <Button + android:visibility="invisible" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content"/> + </LinearLayout> </LinearLayout> <!-- NOTIFICATIONS SETTINGS --> @@ -251,6 +272,13 @@ android:layout_marginBottom="@dimen/settings_checkbox_margin" android:text="@string/set_notif_follow_share" android:layout_height="wrap_content" /> + <CheckBox + android:id="@+id/set_notif_follow_poll" + android:layout_width="wrap_content" + android:layout_marginTop="@dimen/settings_checkbox_margin" + android:layout_marginBottom="@dimen/settings_checkbox_margin" + android:text="@string/set_notif_follow_poll" + android:layout_height="wrap_content" /> <!-- END NOTIFICATIONS SETTINGS --> <!-- NOTIFICATION CONTENT NEW --> |