mirror of
https://github.com/DrKLO/Telegram.git
synced 2024-12-22 06:25:14 +01:00
Restored wrongly deleted code
This commit is contained in:
parent
d728d9c405
commit
91f2073780
3 changed files with 27 additions and 2 deletions
|
@ -81,7 +81,7 @@ android {
|
|||
defaultConfig {
|
||||
minSdkVersion 8
|
||||
targetSdkVersion 19
|
||||
versionCode 267
|
||||
versionCode 268
|
||||
versionName "1.5.7"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ package org.telegram.ui;
|
|||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.text.Html;
|
||||
|
@ -260,6 +261,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
MessagesController.getInstance().addUserToChat(chat_id, user, info);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityResultFragment(int requestCode, int resultCode, Intent data) {
|
||||
avatarUpdater.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveSelfArgs(Bundle args) {
|
||||
if (avatarUpdater != null && avatarUpdater.currentPicturePath != null) {
|
||||
|
|
|
@ -245,7 +245,26 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||
}
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
|
||||
builder.setTitle(LocaleController.getString("TextSize", R.string.TextSize));
|
||||
builder.setItems(new CharSequence[]{String.format("%d", 12), String.format("%d", 13), String.format("%d", 14), String.format("%d", 15), String.format("%d", 16), String.format("%d", 17), String.format("%d", 18), String.format("%d", 19), String.format("%d", 20), String.format("%d", 21), String.format("%d", 22), String.format("%d", 23), String.format("%d", 24)}, new DialogInterface.OnClickListener() {
|
||||
builder.setItems(new CharSequence[] {
|
||||
String.format("%d", 12),
|
||||
String.format("%d", 13),
|
||||
String.format("%d", 14),
|
||||
String.format("%d", 15),
|
||||
String.format("%d", 16),
|
||||
String.format("%d", 17),
|
||||
String.format("%d", 18),
|
||||
String.format("%d", 19),
|
||||
String.format("%d", 20),
|
||||
String.format("%d", 21),
|
||||
String.format("%d", 22),
|
||||
String.format("%d", 23),
|
||||
String.format("%d", 24),
|
||||
String.format("%d", 25),
|
||||
String.format("%d", 26),
|
||||
String.format("%d", 27),
|
||||
String.format("%d", 28),
|
||||
String.format("%d", 29),
|
||||
String.format("%d", 30)}, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
|
||||
|
|
Loading…
Reference in a new issue