diff options
author | Arne Schwabe <arne@rfc2549.org> | 2012-05-13 01:16:27 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-13 01:16:27 +0200 |
commit | d0a2ac4569bb15c097ba2c542ae1748ba1edbdc1 (patch) | |
tree | f2733212c02f8816a6188c70fd0e358876b90d0e /src/de/blinkt/openvpn/FileSelect.java | |
parent | a18032550d38b3530b6488c7c845bda3132b5075 (diff) |
Config Import useable (closes issue #14)
Correct save/restore state in Basic Settings (closes issue #17)
Diffstat (limited to 'src/de/blinkt/openvpn/FileSelect.java')
-rw-r--r-- | src/de/blinkt/openvpn/FileSelect.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java index 12a3ae01..cc8f55f4 100644 --- a/src/de/blinkt/openvpn/FileSelect.java +++ b/src/de/blinkt/openvpn/FileSelect.java @@ -19,6 +19,7 @@ import android.os.Bundle; public class FileSelect extends Activity { public static final String RESULT_DATA = "RESULT_PATH"; public static final String START_DATA = "START_DATA"; + public static final String WINDOW_TITLE = "WINDOW_TILE"; public static final String NO_INLINE_SELECTION = "de.blinkt.openvpn.NO_INLINE_SELECTION"; private FileSelectionFragment mFSFragment; private InlineFileTab mInlineFragment; @@ -26,7 +27,8 @@ public class FileSelect extends Activity { private Tab inlineFileTab; private Tab fileExplorerTab; private boolean mNoInline; - + + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -36,6 +38,13 @@ public class FileSelect extends Activity { if(mData==null) mData="/sdcard"; + String title = getIntent().getStringExtra(WINDOW_TITLE); + int titleId = getIntent().getIntExtra(WINDOW_TITLE, 0); + if(titleId!=0) + title =getString(titleId); + if(title!=null) + setTitle(title); + mNoInline = getIntent().getBooleanExtra(NO_INLINE_SELECTION, false); ActionBar bar = getActionBar(); |