Merge pull request #408 from okcaptain/dev

Dev

app/src/main/java/com/fongmi/android/tv/App.java

@@ -85,7 +85,7 @@ public class App extends Application {
 
     private void setActivity(Activity activity) {
         this.activity = activity;
-        LanguageUtil.setLanguage(getResources(),Setting.getLanguage());
+        LanguageUtil.setLanguage(getResources(), Setting.getLanguage());
     }
 
     private LogAdapter getLogAdapter() {

app/src/main/java/com/fongmi/android/tv/utils/LanguageUtil.java

@@ -1,7 +1,5 @@
 package com.fongmi.android.tv.utils;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.content.res.Resources;
 
 import java.util.Locale;
@@ -26,7 +24,7 @@ public class LanguageUtil {
 
     private static Locale getLocale(int lang) {
         if (lang == 0) return Locale.ENGLISH;
-        else if (lang == 1) return Locale.CHINESE;
+        else if (lang == 1) return Locale.SIMPLIFIED_CHINESE;
         else if (lang == 2) return Locale.TRADITIONAL_CHINESE;
         else return Locale.ENGLISH;
     }