expvintl/NeoTerm_System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.oschina.net:lody/neoterm

Browse Source 
# Conflicts:
#	app/src/main/res/values/strings.xml
This commit is contained in:
zt515 2017-06-12 17:55:28 +08:00
parent 814a05088d
commit bcf7e1ef22
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/neoterm/ui/settings/SettingActivity.kt
View File

@ -12,7 +12,7 @@ class SettingActivity : AppCompatPreferenceActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
supportActionBar.title = getString(R.string.settings) supportActionBar.title = getString(R.string.menu_settings)
supportActionBar.setDisplayHomeAsUpEnabled(true) supportActionBar.setDisplayHomeAsUpEnabled(true)
addPreferencesFromResource(R.xml.settings_main) addPreferencesFromResource(R.xml.settings_main)
} }