Merge remote-tracking branch 'origin/dev-AS' into dev-AS

This commit is contained in:
seven332 committed 2015-03-27 19:01:44 +08:00
commit b992602b2d
7 files changed
+99 -66

No files matched your search

@@ -41,7 +41,6 @@ public final class Config {
private static boolean mInit = false;
private static Context mContext;
private static SharedPreferences mConfigPre;
/**
@@ -54,8 +53,7 @@ public final class Config {
return;
mInit = true;
mContext = context;
mConfigPre = PreferenceManager.getDefaultSharedPreferences(mContext);
mConfigPre = PreferenceManager.getDefaultSharedPreferences(context);
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
sExternalDir = new File(Environment.getExternalStorageDirectory(), EXTERANL_DIR_NAME);