mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Preference compat" 

This reverts commit 8a2ddf6cac.
This commit is contained in:
M66B 2016-02-01 17:42:36 +01:00
parent 8a2ddf6cac
commit 29d1c26166
7 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/app.iml
View File

@ -91,10 +91,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/preference-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.h6ah4i.android.compat/mulsellistprefcompat/1.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@ -114,8 +112,6 @@
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="mulsellistprefcompat-1.0.0" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="preference-v7-23.1.1" level="project" />
</component>
</module>

2
app/build.gradle
View File

@ -56,7 +56,5 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.+'
compile 'com.android.support:recyclerview-v7:23.1.+'
compile 'com.android.support:preference-v7:23.1.+'
compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0' // Google come on ...
compile 'com.squareup.picasso:picasso:2.5.+'
}

2
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -101,7 +101,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
protected void onCreate(Bundle savedInstanceState) {
Util.setTheme(this);
super.onCreate(savedInstanceState);
getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new FragmentSettings()).commit();
getFragmentManager().beginTransaction().replace(android.R.id.content, new FragmentSettings()).commit();
getSupportActionBar().setTitle(R.string.menu_settings);
}

9
app/src/main/java/eu/faircode/netguard/FragmentSettings.java
View File

@ -20,16 +20,13 @@ package eu.faircode.netguard;
*/
import android.os.Bundle;
import android.support.v7.preference.PreferenceFragmentCompat;
import android.preference.PreferenceFragment;
public class FragmentSettings extends PreferenceFragment {
public class FragmentSettings extends PreferenceFragmentCompat {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public void onCreatePreferences(Bundle bundle, String s) {
addPreferencesFromResource(R.xml.preferences);
}
}

3
app/src/main/java/eu/faircode/netguard/SwitchPreference.java
View File

@ -20,12 +20,11 @@ package eu.faircode.netguard;
*/
import android.content.Context;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.util.AttributeSet;
// https://code.google.com/p/android/issues/detail?id=26194
public class SwitchPreference extends SwitchPreferenceCompat {
public class SwitchPreference extends android.preference.SwitchPreference {
public SwitchPreference(Context context) {
this(context, null);
}

2
app/src/main/res/values/styles.xml
View File

@ -5,12 +5,10 @@
<style name="BaseThemeDark" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowDisablePreview">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
</style>
<style name="BaseThemeLight" parent="Theme.AppCompat">
<item name="android:windowDisablePreview">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
</style>
<style name="AppThemeTeal" parent="BaseThemeDark">

2
app/src/main/res/xml/preferences.xml
View File

@ -56,7 +56,7 @@
android:defaultValue="false"
android:key="tethering"
android:title="@string/setting_tethering" />
<com.h6ah4i.android.compat.preference.MultiSelectListPreferenceCompat
<MultiSelectListPreference
android:defaultValue="@array/default_wifi_home"
android:key="wifi_homes"
android:summary="@string/summary_wifi_home" />