Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev

Browse Source 
automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese
This commit is contained in:
Jinsuk Kim
2014-10-30 19:09:06 +00:00
committed by android-build-merger
parent 9802c4c206 44ce605024
commit 2dfb7397b4
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -90,6 +90,8 @@ import java.util.Locale;
*/ */
public final class HdmiControlService extends SystemService { public final class HdmiControlService extends SystemService {
private static final String TAG = "HdmiControlService"; private static final String TAG = "HdmiControlService";
private final Locale HONG_KONG = new Locale("zh", "HK");
private final Locale MACAU = new Locale("zh", "MO");
static final String PERMISSION = "android.permission.HDMI_CEC"; static final String PERMISSION = "android.permission.HDMI_CEC";
@@ -146,13 +148,25 @@ public final class HdmiControlService extends SystemService {
} }
break; break;
case Intent.ACTION_CONFIGURATION_CHANGED: case Intent.ACTION_CONFIGURATION_CHANGED:
String language = Locale.getDefault().getISO3Language(); String language = getMenuLanguage();
if (!mLanguage.equals(language)) { if (!mLanguage.equals(language)) {
onLanguageChanged(language); onLanguageChanged(language);
} }
break; break;
} }
} }
private String getMenuLanguage() {
Locale locale = Locale.getDefault();
if (locale.equals(Locale.TAIWAN) || locale.equals(HONG_KONG) || locale.equals(MACAU)) {
// Android always returns "zho" for all Chinese variants.
// Use "bibliographic" code defined in CEC639-2 for traditional
// Chinese used in Taiwan/Hong Kong/Macau.
return "chi";
} else {
return locale.getISO3Language();
}
}
} }
// A thread to handle synchronous IO of CEC and MHL control service. // A thread to handle synchronous IO of CEC and MHL control service.