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
b9414c6b
Commit
b9414c6b
authored
Feb 25, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #249 from Mygod/master
Providing up navigation
parents
730efbaf
0d54d9cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-1
src/main/scala/com/github/shadowsocks/AppManager.scala
src/main/scala/com/github/shadowsocks/AppManager.scala
+6
-1
No files found.
src/main/AndroidManifest.xml
View file @
b9414c6b
...
...
@@ -65,7 +65,8 @@
<activity
android:name=
".AppManager"
android:theme=
"@style/Theme.AppManager"
android:label=
"@string/app_name"
>
android:label=
"@string/app_name"
android:parentActivityName=
".Shadowsocks"
>
<intent-filter>
<action
android:name=
"com.github.shadowsocks.AppManager"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
...
...
src/main/scala/com/github/shadowsocks/AppManager.scala
View file @
b9414c6b
...
...
@@ -259,6 +259,9 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe
}
Toast
.
makeText
(
this
,
R
.
string
.
action_import_err
,
Toast
.
LENGTH_SHORT
).
show
()
return
false
case
android
.
R
.
id
.
home
=>
navigateUpTo
(
getParentActivityIntent
)
return
true
}
super
.
onOptionsItemSelected
(
item
)
}
...
...
@@ -274,7 +277,9 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe
handler
=
new
Handler
()
getActionBar
.
setTitle
(
R
.
string
.
proxied_help
)
val
actionBar
=
getActionBar
()
actionBar
.
setTitle
(
R
.
string
.
proxied_help
)
actionBar
.
setDisplayHomeAsUpEnabled
(
true
)
this
.
setContentView
(
R
.
layout
.
layout_apps
)
this
.
overlay
=
View
.
inflate
(
this
,
R
.
layout
.
overlay
,
null
).
asInstanceOf
[
TextView
]
getWindowManager
.
addView
(
overlay
,
new
...
...
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