Missed some sdk 16 stuff

pull/996/head
Alex Baker 6 years ago
parent 845b071749
commit fe37699bc2

@ -1,12 +1,9 @@
package org.tasks.locale; package org.tasks.locale;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.View; import android.view.View;
import android.view.ViewParent; import android.view.ViewParent;
@ -109,14 +106,12 @@ public class Locale implements Serializable {
return languageOverride; return languageOverride;
} }
@SuppressLint("NewApi")
public Context createConfigurationContext(Context context) { public Context createConfigurationContext(Context context) {
return hasUserOverrides return hasUserOverrides
? context.createConfigurationContext(getLocaleConfiguration()) ? context.createConfigurationContext(getLocaleConfiguration())
: context; : context;
} }
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
private Configuration getLocaleConfiguration() { private Configuration getLocaleConfiguration() {
Configuration configuration = new Configuration(); Configuration configuration = new Configuration();
configuration.locale = getLocale(); configuration.locale = getLocale();
@ -127,7 +122,6 @@ public class Locale implements Serializable {
return configuration; return configuration;
} }
@SuppressLint("NewApi")
public void applyOverrideConfiguration(ContextThemeWrapper wrapper) { public void applyOverrideConfiguration(ContextThemeWrapper wrapper) {
if (hasUserOverrides) { if (hasUserOverrides) {
wrapper.applyOverrideConfiguration(getLocaleConfiguration()); wrapper.applyOverrideConfiguration(getLocaleConfiguration());
@ -197,7 +191,6 @@ public class Locale implements Serializable {
+ '}'; + '}';
} }
@SuppressLint("NewApi")
public void applyDirectionality(Dialog dialog) { public void applyDirectionality(Dialog dialog) {
if (hasUserOverrides) { if (hasUserOverrides) {
dialog.findViewById(android.R.id.content).setLayoutDirection(appDirectionality); dialog.findViewById(android.R.id.content).setLayoutDirection(appDirectionality);
@ -211,8 +204,4 @@ public class Locale implements Serializable {
public String getLanguage() { public String getLanguage() {
return appLocale.getLanguage(); return appLocale.getLanguage();
} }
public String getCountry() {
return appLocale.getCountry();
}
} }

@ -182,8 +182,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/card_view_margin" android:layout_marginStart="@dimen/card_view_margin"
android:layout_marginEnd="@dimen/card_view_margin" android:layout_marginEnd="@dimen/card_view_margin"
android:layout_marginLeft="@dimen/card_view_margin"
android:layout_marginRight="@dimen/card_view_margin"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:contentDescription="@android:string/search_go" android:contentDescription="@android:string/search_go"
android:src="@drawable/ic_outline_search_24px" android:src="@drawable/ic_outline_search_24px"

@ -32,7 +32,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/text1" android:layout_below="@id/text1"
android:layout_alignStart="@id/text1" android:layout_alignStart="@id/text1"
android:layout_alignLeft="@id/text1"
android:textAppearance="?attr/textAppearanceListItemSecondary" /> android:textAppearance="?attr/textAppearanceListItemSecondary" />
</TwoLineListItem> </TwoLineListItem>

Loading…
Cancel
Save