diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java
index cb811900c..0ccb1d373 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java
@@ -50,7 +50,6 @@ import com.b44t.ui.Adapters.BaseFragmentAdapter;
import com.b44t.ui.Cells.HeaderCell;
import com.b44t.ui.Cells.ShadowSectionCell;
import com.b44t.ui.Cells.TextCheckCell;
-import com.b44t.ui.Cells.TextDetailSettingsCell;
import com.b44t.ui.ActionBar.ActionBar;
import com.b44t.ui.ActionBar.BaseFragment;
import com.b44t.ui.Cells.TextSettingsCell;
@@ -90,10 +89,9 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
private final int TYPE_HEADER = 0;
private final int TYPE_CHECK_CELL = 1;
- private final int TYPE_TEXTDETAIL = 2;
- private final int TYPE_SHADOW = 3;
- private final int TYPE_TEXTSETTING = 4;
- private final int TYPE_COUNT = 5;
+ private final int TYPE_SHADOW = 2;
+ private final int TYPE_TEXTSETTING = 3;
+ private final int TYPE_COUNT = 4;
@Override
public boolean onFragmentCreate() {
@@ -565,16 +563,6 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
} else if (i == inchatSoundRow) {
checkCell.setTextAndCheck(mContext.getString(R.string.InChatSound), preferences.getBoolean("EnableInChatSound", true), true);
}
- } else if (type == TYPE_TEXTDETAIL) {
- if (view == null) {
- view = new TextDetailSettingsCell(mContext);
- }
- TextDetailSettingsCell textCell = (TextDetailSettingsCell) view;
-
- if (i == resetNotificationsRow) {
- textCell.setMultilineDetail(true);
- textCell.setTextAndValue(mContext.getString(R.string.Reset), mContext.getString(R.string.ResetAllNotifications), false);
- }
} else if (type == TYPE_TEXTSETTING) {
if (view == null) {
view = new TextSettingsCell(mContext);
@@ -648,6 +636,9 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
textCell.setTextAndColor(mContext.getString(R.string.LedColor), color, true);
}
}
+ else if (i == resetNotificationsRow) {
+ textCell.setText(mContext.getString(R.string.ResetAllNotifications), false);
+ }
} else if (type == TYPE_SHADOW) {
if (view == null) {
view = new ShadowSectionCell(mContext);
@@ -669,8 +660,6 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
} else if ( i == groupSectionRow2 ||
i == inappSectionRow2 || i == otherSectionRow2 ) {
return TYPE_SHADOW;
- } else if( i==resetNotificationsRow ){
- return TYPE_TEXTDETAIL;
} else {
return TYPE_TEXTSETTING;
}
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index 3c5e0458a..1dcdf7dc6 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -78,7 +78,6 @@
Nachrichtenton
Bei App im Vordergrund
Vibrieren
- Zurücksetzen
Mitteilungseinstellungen zurücksetzen
Mitteilungen und Töne
Blockierte Kontakte
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index f05476f0b..c9326c5bc 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -78,7 +78,6 @@
Sonido
Notificaciones en la app
Vibraciones
- Restablecer
Restablecer las notificaciones
Notificaciones y sonidos
Usuarios bloqueados
diff --git a/MessengerProj/src/main/res/values-fr/strings.xml b/MessengerProj/src/main/res/values-fr/strings.xml
index f43b5bb2c..81324753e 100644
--- a/MessengerProj/src/main/res/values-fr/strings.xml
+++ b/MessengerProj/src/main/res/values-fr/strings.xml
@@ -75,7 +75,6 @@
Son
Notifications dans l\'application
Vibrer
- Reinitialiser
Réinitialiser les notifications
Notifications et sons
Contacts bloqués
diff --git a/MessengerProj/src/main/res/values-hu/strings.xml b/MessengerProj/src/main/res/values-hu/strings.xml
index 5d9073973..8b6f91d46 100644
--- a/MessengerProj/src/main/res/values-hu/strings.xml
+++ b/MessengerProj/src/main/res/values-hu/strings.xml
@@ -78,7 +78,6 @@
Hang
Alkalmazáson belüli értesítések
Rezgés
- Visszaállítás
Minden értesítés visszaállítása
Értesítések és hangok
Letiltott partnerek
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 3384b8652..6ff973a3d 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -77,7 +77,6 @@
Suono
Notifiche in-app
Vibrazione
- Ripristina
Ripristina tutte le notifiche
Notifiche e suoni
Utenti bloccati
diff --git a/MessengerProj/src/main/res/values-ko/strings.xml b/MessengerProj/src/main/res/values-ko/strings.xml
index 29c566516..5ba6ea359 100644
--- a/MessengerProj/src/main/res/values-ko/strings.xml
+++ b/MessengerProj/src/main/res/values-ko/strings.xml
@@ -71,7 +71,6 @@
>알림음
앱 내 알림
진동
- 초기화
모든 알림 설정 초기화
알림 및 소리
차단 목록
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index d7961339d..0fc622132 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -77,7 +77,6 @@
Geluid
In-app meldingen
Trillen
- Resetten
Meldingen resetten
Meldingen en geluiden
Geblokkeerd
diff --git a/MessengerProj/src/main/res/values-pl/strings.xml b/MessengerProj/src/main/res/values-pl/strings.xml
index 6fc3a816a..8fbbbe5d2 100644
--- a/MessengerProj/src/main/res/values-pl/strings.xml
+++ b/MessengerProj/src/main/res/values-pl/strings.xml
@@ -78,7 +78,6 @@
Dźwięki
Powiadomienia w aplikacji
Wibracje
- Resetuj
Resetuj wszystkie powiadomienia
Powiadomienia i dźwięki
Zablokowane kontakty
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 49da644f0..3b4b7f4e7 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -77,7 +77,6 @@
Som
Notificações no aplicativo
Vibrar
- Limpar
Restaurar configurações
Notificações e Sons
Usuários bloqueados
diff --git a/MessengerProj/src/main/res/values-ru/strings.xml b/MessengerProj/src/main/res/values-ru/strings.xml
index 6895ea0bb..f272399c0 100644
--- a/MessengerProj/src/main/res/values-ru/strings.xml
+++ b/MessengerProj/src/main/res/values-ru/strings.xml
@@ -78,7 +78,6 @@
Звук
Уведомления внутри программы
Вибрировать
- Сброс
Сбросить все уведомления
Уведомления и Звуки
Заблокированные контакты
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index 0c5f0875f..178490e5d 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -78,7 +78,6 @@
Sound
In-app notifications
Vibrate
- Reset
Reset all notifications
Notifications and sounds
Blocked contacts