OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2025-03-15 20:08:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Removing the code which displays the native emoji instead of normal ones (not really useful)

Browse source
This commit is contained in:
fduraibi 2014-03-03 23:50:27 -05:00
parent 03c944d3b9
commit 3d9ba9a54a
4 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
View file

@ -11,8 +11,6 @@ package org.telegram.messenger;
import java.io.InputStream;
import java.util.HashMap;
import android.app.Activity;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@ -503,7 +501,7 @@ public class Emoji {
if (c == 0xD83C || c == 0xD83D || (buf != 0 && (buf & 0xFFFFFFFF00000000L) == 0 && (c >= 0xDDE6 && c <= 0xDDFA))) {
buf <<= 16;
buf |= c;
} else if (buf > 0 && ( (c & 0xF000) == 0xD000 ) ) {
} else if (buf > 0 && (c & 0xF000) == 0xD000) {
buf <<= 16;
buf |= c;
Drawable d = Emoji.getEmojiDrawable(buf);
@ -541,8 +539,7 @@ public class Emoji {
s.setSpan(span, i, i + 1, 0);
}
}
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
if (emojiCount >= 200 || preferences.getBoolean("native_emoji", false)) {
if (emojiCount >= 200) {
break;
}
}

24
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file

@ -83,7 +83,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
int photoDownloadChatRow;
int photoDownloadPrivateRow;
int AddForwardingInfoRow;
int NativeEmojiRow;
int InvisibleStatusRow;
@Override
@ -155,7 +154,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
settingsSectionRow = rowCount++;
enableAnimationsRow = rowCount++;
AddForwardingInfoRow = rowCount++;
NativeEmojiRow = rowCount++;
InvisibleStatusRow = rowCount++;
notificationRow = rowCount++;
blockedRow = rowCount++;
@ -390,15 +388,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
if (listView != null) {
listView.invalidateViews();
}
} else if (i == NativeEmojiRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean value = preferences.getBoolean("native_emoji", false);
SharedPreferences.Editor editor = preferences.edit();
editor.putBoolean("native_emoji", !value);
editor.commit();
if (listView != null) {
listView.invalidateViews();
}
} else if (i == InvisibleStatusRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean value = preferences.getBoolean("invisible_status", false);
@ -542,7 +531,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
public boolean isEnabled(int i) {
return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow ||
i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == terminateSessionsRow || i == photoDownloadPrivateRow ||
i == photoDownloadChatRow || i == AddForwardingInfoRow || i == NativeEmojiRow || i == InvisibleStatusRow || i == clearLogsRow;
i == photoDownloadChatRow || i == AddForwardingInfoRow || i == InvisibleStatusRow || i == clearLogsRow;
}
@Override
@ -798,15 +787,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == NativeEmojiRow) {
textView.setText(getStringEntry(R.string.NativeEmoji));
divider.setVisibility(View.VISIBLE);
boolean enabled = preferences.getBoolean("native_emoji", false);
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == InvisibleStatusRow) {
textView.setText(getStringEntry(R.string.InvisibleStatus));
divider.setVisibility(View.VISIBLE);
@ -881,7 +861,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
return 1;
} else if (i == textSizeRow) {
return 5;
} else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow || i == AddForwardingInfoRow || i== NativeEmojiRow || i == InvisibleStatusRow) {
} else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow || i == AddForwardingInfoRow || i == InvisibleStatusRow) {
return 3;
} else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow) {
return 2;

1
TMessagesProj/src/main/res/values-ar/strings.xml
View file

@ -247,7 +247,6 @@
<string name="AutomaticPhotoDownloadPrivateChats">المحادثات</string>
<string name="Events">الأحداث</string>
<string name="AddForwardingInfo">ادراج معلومات التوجية</string>
<string name="NativeEmoji">استخدم ايقونات النظام</string>
<string name="InvisibleStatus">اخفاء الحالة</string>
<string name="ContactJoined">اشترك صديق في تيليجرام</string>

1
TMessagesProj/src/main/res/values/strings.xml
View file

@ -248,7 +248,6 @@
<string name="Events">EVENTS</string>
<string name="ContactJoined">Contact joined Telegram</string>
<string name="AddForwardingInfo">Add Forwarding Info</string>
<string name="NativeEmoji">Native Emoji</string>
<string name="InvisibleStatus">Invisible status</string>
<!--media view-->