Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apk
Commits
1a9632e0
Commit
1a9632e0
authored
Jul 13, 2014
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Alert EditText background on 2.x
parent
1122ab85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
build.gradle
TMessagesProj/build.gradle
+1
-1
FileLoader.java
...Proj/src/main/java/org/telegram/messenger/FileLoader.java
+7
-1
ContactsActivity.java
...sProj/src/main/java/org/telegram/ui/ContactsActivity.java
+8
-0
No files found.
TMessagesProj/build.gradle
View file @
1a9632e0
...
...
@@ -83,7 +83,7 @@ android {
defaultConfig
{
minSdkVersion
8
targetSdkVersion
19
versionCode
27
8
versionCode
27
9
versionName
"1.6.0"
}
}
TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
View file @
1a9632e0
...
...
@@ -946,8 +946,14 @@ public class FileLoader {
}
}
};
boolean
isLocalFile
=
false
;
if
(
httpUrl
!=
null
&&
!
httpUrl
.
startsWith
(
"http"
))
{
isLocalFile
=
true
;
}
img
.
loadOperation
=
loadOperation
;
if
(
runningOperation
.
size
()
<
maxConcurentLoadingOpertaionsCount
)
{
if
(
runningOperation
.
size
()
<
maxConcurentLoadingOpertaionsCount
||
isLocalFile
)
{
loadOperation
.
start
();
runningOperation
.
add
(
loadOperation
);
}
else
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
View file @
1a9632e0
...
...
@@ -24,6 +24,7 @@ import android.view.inputmethod.EditorInfo;
import
android.widget.AbsListView
;
import
android.widget.AdapterView
;
import
android.widget.EditText
;
import
android.widget.FrameLayout
;
import
android.widget.TextView
;
import
org.telegram.android.AndroidUtilities
;
...
...
@@ -350,6 +351,9 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
builder
.
setTitle
(
LocaleController
.
getString
(
"AppName"
,
R
.
string
.
AppName
));
builder
.
setMessage
(
LocaleController
.
formatStringSimple
(
selectAlertString
,
Utilities
.
formatName
(
user
.
first_name
,
user
.
last_name
)));
final
EditText
editText
=
new
EditText
(
getParentActivity
());
if
(
android
.
os
.
Build
.
VERSION
.
SDK_INT
<
11
)
{
editText
.
setBackgroundResource
(
android
.
R
.
drawable
.
editbox_background_normal
);
}
editText
.
setTextSize
(
18
);
editText
.
setText
(
"50"
);
editText
.
setGravity
(
Gravity
.
CENTER
);
...
...
@@ -366,9 +370,13 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
showAlertDialog
(
builder
);
ViewGroup
.
MarginLayoutParams
layoutParams
=
(
ViewGroup
.
MarginLayoutParams
)
editText
.
getLayoutParams
();
if
(
layoutParams
!=
null
)
{
if
(
layoutParams
instanceof
FrameLayout
.
LayoutParams
)
{
((
FrameLayout
.
LayoutParams
)
layoutParams
).
gravity
=
Gravity
.
CENTER_HORIZONTAL
;
}
layoutParams
.
rightMargin
=
layoutParams
.
leftMargin
=
AndroidUtilities
.
dp
(
10
);
editText
.
setLayoutParams
(
layoutParams
);
}
editText
.
setSelection
(
editText
.
getText
().
length
());
}
else
{
if
(
delegate
!=
null
)
{
delegate
.
didSelectContact
(
user
,
param
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment