Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
56a065b1
Commit
56a065b1
authored
Dec 01, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #461 from Mygod/master
Some fixes
parents
ecfbc3e1
41b7da4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
...cala/com/github/shadowsocks/ShadowsocksNotification.scala
+1
-1
src/main/scala/com/github/shadowsocks/preferences/NumberPickerPreference.scala
...thub/shadowsocks/preferences/NumberPickerPreference.scala
+6
-1
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
View file @
56a065b1
...
@@ -26,7 +26,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
...
@@ -26,7 +26,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
}
}
}
}
private
var
lockReceiver
:
BroadcastReceiver
=
_
private
var
lockReceiver
:
BroadcastReceiver
=
_
private
var
callbackRegistered
:
Boolean
=
true
private
var
callbackRegistered
:
Boolean
=
_
private
val
builder
=
new
NotificationCompat
.
Builder
(
service
)
private
val
builder
=
new
NotificationCompat
.
Builder
(
service
)
.
setWhen
(
0
)
.
setWhen
(
0
)
...
...
src/main/scala/com/github/shadowsocks/preferences/NumberPickerPreference.scala
View file @
56a065b1
...
@@ -2,9 +2,10 @@ package com.github.shadowsocks.preferences
...
@@ -2,9 +2,10 @@ package com.github.shadowsocks.preferences
import
android.content.Context
import
android.content.Context
import
android.content.res.TypedArray
import
android.content.res.TypedArray
import
android.os.Bundle
import
android.preference.DialogPreference
import
android.preference.DialogPreference
import
android.util.AttributeSet
import
android.util.AttributeSet
import
android.view.
ViewGroup
import
android.view.
{
ViewGroup
,
WindowManager
}
import
android.widget.NumberPicker
import
android.widget.NumberPicker
import
com.github.shadowsocks.R
import
com.github.shadowsocks.R
...
@@ -36,6 +37,10 @@ final class NumberPickerPreference(context: Context, attrs: AttributeSet = null)
...
@@ -36,6 +37,10 @@ final class NumberPickerPreference(context: Context, attrs: AttributeSet = null)
def
setMin
(
value
:
Int
)
=
picker
.
setMinValue
(
value
)
def
setMin
(
value
:
Int
)
=
picker
.
setMinValue
(
value
)
def
setMax
(
value
:
Int
)
=
picker
.
setMaxValue
(
value
)
def
setMax
(
value
:
Int
)
=
picker
.
setMaxValue
(
value
)
override
protected
def
showDialog
(
state
:
Bundle
)
{
super
.
showDialog
(
state
)
getDialog
.
getWindow
.
setSoftInputMode
(
WindowManager
.
LayoutParams
.
SOFT_INPUT_STATE_ALWAYS_VISIBLE
)
}
override
protected
def
onCreateDialogView
=
{
override
protected
def
onCreateDialogView
=
{
val
parent
=
picker
.
getParent
.
asInstanceOf
[
ViewGroup
]
val
parent
=
picker
.
getParent
.
asInstanceOf
[
ViewGroup
]
if
(
parent
!=
null
)
parent
.
removeView
(
picker
)
if
(
parent
!=
null
)
parent
.
removeView
(
picker
)
...
...
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