From e7b6425dbdc627b5c420d2bc74dc1ea4e518cde7 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 19 Oct 2016 01:03:56 +0200 Subject: [PATCH] Organize settings activity, continued. --- .../src/main/java/org/telegram/ui/SettingsActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 4a23af71c..2fe44f4f1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -236,8 +236,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter messagesSectionRow = rowCount++; messagesSectionRow2 = rowCount++; - sendByEnterRow = rowCount++; // outgoing message - raiseToSpeakRow = rowCount++; textSizeRow = rowCount++; // incoming messages customTabsRow = rowCount++; stickersRow = -1; // EDIT BY MR --was: rowCount++; @@ -247,6 +245,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter else { directShareRow = -1; } + raiseToSpeakRow = rowCount++; // outgoing message + sendByEnterRow = rowCount++; supportSectionRow = rowCount++; supportSectionRow2 = rowCount++; @@ -1380,7 +1380,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter if (i == enableAnimationsRow) { textCell.setTextAndCheck(LocaleController.getString("EnableAnimations", R.string.EnableAnimations), preferences.getBoolean("view_animations", true), true); } else if (i == sendByEnterRow) { - textCell.setTextAndCheck(LocaleController.getString("SendByEnter", R.string.SendByEnter), preferences.getBoolean("send_by_enter", false), true); + textCell.setTextAndCheck(LocaleController.getString("SendByEnter", R.string.SendByEnter), preferences.getBoolean("send_by_enter", false), false); } else if (i == saveToGalleryRow) { textCell.setTextAndCheck(LocaleController.getString("SaveToGallerySettings", R.string.SaveToGallerySettings), MediaController.getInstance().canSaveToGallery(), true); } else if (i == autoplayGifsRow) { @@ -1390,7 +1390,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } else if (i == customTabsRow) { textCell.setTextAndValueAndCheck(LocaleController.getString("ChromeCustomTabs", R.string.ChromeCustomTabs), LocaleController.getString("ChromeCustomTabsInfo", R.string.ChromeCustomTabsInfo), MediaController.getInstance().canCustomTabs(), false, true); } else if (i == directShareRow) { - textCell.setTextAndValueAndCheck(LocaleController.getString("DirectShare", R.string.DirectShare), LocaleController.getString("DirectShareInfo", R.string.DirectShareInfo), MediaController.getInstance().canDirectShare(), false, false); + textCell.setTextAndValueAndCheck(LocaleController.getString("DirectShare", R.string.DirectShare), LocaleController.getString("DirectShareInfo", R.string.DirectShareInfo), MediaController.getInstance().canDirectShare(), false, true); } } else if (type == 4) { if (view == null) {