Skip to content

Commit 879c230

Browse files
committed
dev::ING-44::INSTEAD 3.2.2 + target SDK 26 support
1 parent f7e0368 commit 879c230

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

launcher/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<manifest android:installLocation="auto" android:versionCode="148000"
2+
<manifest android:installLocation="auto" android:versionCode="148001"
33
android:versionName="1.4.8" package="com.nlbhub.instead.launcher" xmlns:android="http://schemas.android.com/apk/res/android">
44
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
55
<uses-sdk android:minSdkVersion="13" android:targetSdkVersion="26"/>

modules/instead_standalone/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<manifest android:versionCode="148000"
2+
<manifest android:versionCode="148001"
33
android:versionName="1.4.8" package="com.nlbhub.instead" xmlns:android="http://schemas.android.com/apk/res/android">
44
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
55

modules/instead_standalone/jni/src/instead_launcher.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ extern "C" int SDL_main(int argc, char** argv) {
115115
const char* themespath = argc >= 12 ? argv[11] : NULL;
116116
const char* standalone = argc >= 13 ? argv[12] : NULL;
117117
const char* nocursor = argc >= 14 ? argv[13] : NULL;
118+
const char* lang = argc >= 15 ? argv[14] : NULL;
118119

119120
if (nativelog != NULL) {
120121
logFile = fopen(nativelog, "w");
@@ -123,7 +124,7 @@ extern "C" int SDL_main(int argc, char** argv) {
123124

124125
/* Run the application code! */
125126
int status;
126-
char* _argv[18];
127+
char* _argv[20];
127128
int n = 1;
128129
if (path != NULL) {
129130
printf("path = %s\n", path);
@@ -186,13 +187,19 @@ extern "C" int SDL_main(int argc, char** argv) {
186187
printf("Force own theme = YES\n");
187188
_argv[n++] = SDL_strdup("-owntheme");
188189
} else {
190+
printf("Force own theme = NO\n");
189191
_argv[n++] = SDL_strdup("-notheme");
190192
}
191193
if (is_not_blank(theme)) {
192194
printf("theme = %s\n", theme);
193195
_argv[n++] = SDL_strdup("-theme");
194196
_argv[n++] = SDL_strdup(theme);
195197
}
198+
if (is_not_blank(lang)) {
199+
printf("lang = %s\n", lang);
200+
_argv[n++] = SDL_strdup("-lang");
201+
_argv[n++] = SDL_strdup(lang);
202+
}
196203
_argv[n] = NULL;
197204

198205
printf("Before instead_main()\n");

modules/instead_standalone/src/com/nlbhub/instead/STEADActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.IOException;
2121
import java.util.ArrayList;
2222
import java.util.List;
23+
import java.util.Locale;
2324

2425
/**
2526
* Created by Antokolos on 29.01.16.
@@ -92,7 +93,8 @@ protected String[] getArguments() {
9293
args[9] = settings.getTheme();
9394
args[10] = StorageResolver.getThemesDirectoryPath();
9495
args[11] = properties.isStandalone() ? "Y" : null;
95-
args[13] = (nocursor) ? "Y" : null;
96+
args[12] = (nocursor) ? "Y" : null;
97+
args[13] = Locale.getDefault().getLanguage();
9698
return args;
9799
}
98100

0 commit comments

Comments
 (0)