Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
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
xabber-android
Commits
09bbbf72
Commit
09bbbf72
authored
Apr 29, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag '1.0.0' into develop
1.0.0
parents
1b0564e6
cac564df
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
312 additions
and
49 deletions
+312
-49
build.gradle
app/build.gradle
+2
-2
account_editor_oauth.xml
app/src/main/res/xml/account_editor_oauth.xml
+0
-1
account_editor_xmpp.xml
app/src/main/res/xml/account_editor_xmpp.xml
+0
-3
preference_editor.xml
app/src/main/res/xml/preference_editor.xml
+310
-43
No files found.
app/build.gradle
View file @
09bbbf72
...
@@ -8,8 +8,8 @@ android {
...
@@ -8,8 +8,8 @@ android {
applicationId
"com.xabber.androiddev"
applicationId
"com.xabber.androiddev"
minSdkVersion
14
minSdkVersion
14
targetSdkVersion
22
targetSdkVersion
22
versionCode
17
1
versionCode
17
2
versionName
'
0.10.71
'
versionName
'
1.0.0
'
}
}
compileOptions
{
compileOptions
{
...
...
app/src/main/res/xml/account_editor_oauth.xml
View file @
09bbbf72
...
@@ -53,7 +53,6 @@
...
@@ -53,7 +53,6 @@
<EditTextPreference
<EditTextPreference
android:key=
"@string/account_proxy_port_key"
android:key=
"@string/account_proxy_port_key"
android:title=
"@string/account_proxy_port"
android:title=
"@string/account_proxy_port"
android:inputType=
"number"
android:singleLine=
"true"
android:singleLine=
"true"
/>
/>
<EditTextPreference
<EditTextPreference
...
...
app/src/main/res/xml/account_editor_xmpp.xml
View file @
09bbbf72
...
@@ -66,7 +66,6 @@
...
@@ -66,7 +66,6 @@
android:key=
"@string/account_port_key"
android:key=
"@string/account_port_key"
android:title=
"@string/account_port"
android:title=
"@string/account_port"
android:singleLine=
"true"
android:singleLine=
"true"
android:inputType=
"number"
android:dependency=
"@string/account_custom_key"
android:dependency=
"@string/account_custom_key"
/>
/>
<EditTextPreference
<EditTextPreference
...
@@ -77,7 +76,6 @@
...
@@ -77,7 +76,6 @@
<com.xabber.android.ui.widget.PriorityPreference
<com.xabber.android.ui.widget.PriorityPreference
android:key=
"@string/account_priority_key"
android:key=
"@string/account_priority_key"
android:title=
"@string/account_priority"
android:title=
"@string/account_priority"
android:inputType=
"numberSigned"
android:singleLine=
"true"
android:singleLine=
"true"
/>
/>
<CheckBoxPreference
<CheckBoxPreference
...
@@ -110,7 +108,6 @@
...
@@ -110,7 +108,6 @@
<EditTextPreference
<EditTextPreference
android:key=
"@string/account_proxy_port_key"
android:key=
"@string/account_proxy_port_key"
android:title=
"@string/account_proxy_port"
android:title=
"@string/account_proxy_port"
android:inputType=
"number"
android:singleLine=
"true"
android:singleLine=
"true"
/>
/>
<EditTextPreference
<EditTextPreference
...
...
app/src/main/res/xml/preference_editor.xml
View file @
09bbbf72
This diff is collapsed.
Click to expand it.
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