rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put integer in integers

This commit is contained in:
Snek 2017-03-09 13:58:42 +03:00
parent bf4923cddf
commit f72e5a6a2e
6 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
View File

@ -15,8 +15,6 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import java.util.Locale;
public class LaunchActivity extends AppCompatActivity {
ImageView connect, cancel, imageViewLogo;
TextView status;
@ -168,22 +166,4 @@ public class LaunchActivity extends AppCompatActivity {
super.onPause();
}*/
@SuppressWarnings("deprecation")
private void setLocale(Context context, String lang) {
Configuration config = getBaseContext().getResources().getConfiguration();
Locale myLocale = new Locale(lang);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
config.setLocale(myLocale);
} else {
config.locale = myLocale;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
context = context.createConfigurationContext(config);
} else {
context.getResources().updateConfiguration(config, context.getResources().getDisplayMetrics());
}
}
}

1
app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
View File

@ -4,6 +4,7 @@ package com.example.yink.amadeus;
* Created by Yink on 05.03.2017.
*/
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;

1
app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
View File

@ -20,5 +20,4 @@ public class SettingsFragment extends PreferenceFragment {
addPreferencesFromResource(R.xml.preferences);
}
}

1
app/src/main/res/values-es/strings.xml
View File

@ -5,7 +5,6 @@
<string name="disconnected">Desconectado.</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="lang_default_value">Pt-Pt</string>
<integer name="duration">40</integer>
<string name="line_hello">Hola.</string>
<string name="line_dont_call_me_like_that">No me llames así!</string>

4
app/src/main/res/values/integers.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="duration">40</integer>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -6,7 +6,6 @@
<string name="default_lang">en</string>
<string name="default_recog_lang">en</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<integer name="duration">40</integer>
<!-- Settings -->
<string name="pref_recog_lang">Recognition language</string>