Skip to content
This repository was archived by the owner on Feb 4, 2024. It is now read-only.

Commit 4c05351

Browse files
hvdwolfhvdwolf
committed
big cleanup
1 parent bf397d2 commit 4c05351

5 files changed

Lines changed: 1 addition & 174 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<activity android:label="@string/app_name" android:name="org.hvdw.fytfunctionalityextender.SettingsActivity">
1010
<intent-filter>
1111
<action android:name="android.intent.action.MAIN"/>
12-
<category android:name="de.robv.android.xposed.category.MODULE_SETTINGS"/>
1312
</intent-filter>
1413
</activity>
1514
<activity-alias android:label="@string/app_name" android:name="org.hvdw.fytfunctionalityextender.SettingsActivityAlias" android:enabled="true" android:targetActivity="org.hvdw.fytfunctionalityextender.SettingsActivity">

‎app/src/main/java/org/hvdw/fytfunctionalityextender/MySettings.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,13 @@ class MySettings {
1818
public static final String ACTION_MEDIA_CALL_ENTRY_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_MEDIA_CALL_ENTRY_CHANGED";
1919
public static final String EXTRA_MEDIA_CALL_ENTRY_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_MEDIA_CALL_ENTRY_STRING";
2020

21-
/* public static final String BAND_CALL_OPTION = "band_key_call_option";
22-
public static final String ACTION_BAND_CALL_OPTION_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_BAND_CALL_OPTION_CHANGED";
23-
public static final String EXTRA_BAND_CALL_OPTION_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_BAND_CALL_OPTION_STRING";
24-
public static final String BAND_CALL_ENTRY = "band_key_entry";
25-
public static final String ACTION_BAND_CALL_ENTRY_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_BAND_CALL_ENTRY_CHANGED";
26-
public static final String EXTRA_BAND_CALL_ENTRY_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_BAND_CALL_ENTRY_STRING";
27-
*/
28-
2921
public static final String DVD_CALL_OPTION = "dvd_key_call_option";
3022
public static final String ACTION_DVD_CALL_OPTION_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_DVD_CALL_OPTION_CHANGED";
3123
public static final String EXTRA_DVD_CALL_OPTION_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_DVD_CALL_OPTION_STRING";
3224
public static final String DVD_CALL_ENTRY = "dvd_key_entry";
3325
public static final String ACTION_DVD_CALL_ENTRY_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_DVD_CALL_ENTRY_CHANGED";
3426
public static final String EXTRA_DVD_CALL_ENTRY_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_DVD_CALL_ENTRY_STRING";
3527

36-
37-
/* public static final String EQ_CALL_OPTION = "eq_key_call_option";
38-
public static final String ACTION_EQ_CALL_OPTION_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_EQ_CALL_OPTION_CHANGED";
39-
public static final String EXTRA_EQ_CALL_OPTION_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_EQ_CALL_OPTION_STRING";
40-
public static final String EQ_CALL_ENTRY = "eq_key_entry";
41-
public static final String ACTION_EQ_CALL_ENTRY_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_EQ_CALL_ENTRY_CHANGED";
42-
public static final String EXTRA_EQ_CALL_ENTRY_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_EQ_CALL_ENTRY_STRING";
43-
*/
44-
4528
public static final String ACC_ON_CALL_OPTION = "acc_on_call_option";
4629
public static final String ACTION_ACC_ON_CALL_OPTION_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_ACC_ON_CALL_OPTION_CHANGED";
4730
public static final String EXTRA_ACC_ON_CALL_OPTION_STRING = "org.hvdw.fytfunctionalityextender.extra.PREF_ACC_ON_CALL_OPTION_STRING";
@@ -68,7 +51,6 @@ class MySettings {
6851
public static final String ACTION_PAUSE_PLAYER_CHANGED = "org.hvdw.fytfunctionalityextender.action.ACTION_PAUSE_PLAYER_CHANGED";
6952
public static final String EXTRA_PAUSE_PLAYER_ENABLED = "org.hvdw.fytfunctionalityextender.extra.PAUSE_PLAYER_ENABLED";
7053

71-
7254
/* End of all the necessary variables */
7355

7456
}

‎app/src/main/java/org/hvdw/fytfunctionalityextender/SettingsFragment.java‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77
import android.content.SharedPreferences;
88
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
99
import android.os.Bundle;
10-
//import android.net.Uri;
11-
import android.preference.Preference;
1210
import android.preference.PreferenceFragment;
13-
//import android.preference.PreferenceManager;
14-
//import android.preference.PreferenceActivity;
15-
//import android.preference.ListPreference;
1611
import android.widget.Toast;
1712
import android.app.Activity;
1813
import android.content.BroadcastReceiver;
@@ -23,17 +18,6 @@
2318
import android.widget.ProgressBar;
2419
import android.util.AttributeSet;
2520

26-
import android.content.pm.PackageInfo;
27-
import android.content.pm.PackageManager;
28-
import java.util.List;
29-
import java.util.ArrayList;
30-
import android.app.Application;
31-
import android.content.pm.PackageInfo;
32-
import android.content.pm.PackageManager;
33-
34-
import java.io.File;
35-
36-
3721

3822
public class SettingsFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener {
3923
Context mContext;
@@ -110,16 +94,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
11094
String additionalText = "";
11195

11296
switch (key) {
113-
/* All the settings belonging to the SofiaServer */
114-
/* case MySettings.BAND_CALL_OPTION:
115-
intent.setAction(MySettings.ACTION_BAND_CALL_OPTION_CHANGED);
116-
intent.putExtra(MySettings.EXTRA_BAND_CALL_OPTION_STRING, sharedPreferences.getString(key, ""));
117-
break;
118-
case MySettings.BAND_CALL_ENTRY:
119-
intent.setAction(MySettings.ACTION_BAND_CALL_ENTRY_CHANGED);
120-
intent.putExtra(MySettings.EXTRA_BAND_CALL_ENTRY_STRING, sharedPreferences.getString(key, ""));
121-
break;
122-
*/
12397
case MySettings.USE_ROOT_ACCESS:
12498
intent.setAction(MySettings.ACTION_USE_ROOT_ACCESS_CHANGED);
12599
intent.putExtra(MySettings.EXTRA_USE_ROOT_ACCESS_ENABLED, sharedPreferences.getBoolean(key, true));
@@ -145,38 +119,21 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
145119
intent.putExtra(MySettings.EXTRA_PAUSE_PLAYER_ENABLED, sharedPreferences.getBoolean(key, true));
146120
toastText = "BOOLEAN_KEY";
147121
break;
148-
149-
case MySettings.DVD_CALL_OPTION:
122+
/*case MySettings.DVD_CALL_OPTION:
150123
intent.setAction(MySettings.ACTION_DVD_CALL_OPTION_CHANGED);
151124
intent.putExtra(MySettings.EXTRA_DVD_CALL_OPTION_STRING, sharedPreferences.getString(key, ""));
152125
break;
153126
case MySettings.DVD_CALL_ENTRY:
154127
intent.setAction(MySettings.ACTION_DVD_CALL_ENTRY_CHANGED);
155128
intent.putExtra(MySettings.EXTRA_DVD_CALL_ENTRY_STRING, sharedPreferences.getString(key, ""));
156129
break;
157-
/* case MySettings.EQ_CALL_OPTION:
158-
intent.setAction(MySettings.ACTION_EQ_CALL_OPTION_CHANGED);
159-
intent.putExtra(MySettings.EXTRA_EQ_CALL_OPTION_STRING, sharedPreferences.getString(key, ""));
160-
break;
161-
case MySettings.EQ_CALL_ENTRY:
162-
intent.setAction(MySettings.ACTION_EQ_CALL_ENTRY_CHANGED);
163-
intent.putExtra(MySettings.EXTRA_EQ_CALL_ENTRY_STRING, sharedPreferences.getString(key, ""));
164-
break; */
165130
case MySettings.MEDIA_CALL_OPTION:
166131
intent.setAction(MySettings.ACTION_MEDIA_CALL_OPTION_CHANGED);
167132
intent.putExtra(MySettings.EXTRA_MEDIA_CALL_OPTION_STRING, sharedPreferences.getString(key, ""));
168133
break;
169134
case MySettings.MEDIA_CALL_ENTRY:
170135
intent.setAction(MySettings.ACTION_MEDIA_CALL_ENTRY_CHANGED);
171136
intent.putExtra(MySettings.EXTRA_MEDIA_CALL_ENTRY_STRING, sharedPreferences.getString(key, ""));
172-
break;
173-
/* case MySettings.NAVI_CALL_OPTION:
174-
intent.setAction(MySettings.ACTION_NAVI_CALL_OPTION_CHANGED);
175-
intent.putExtra(MySettings.EXTRA_NAVI_CALL_OPTION_STRING, sharedPreferences.getString(key, ""));
176-
break;
177-
case MySettings.NAVI_CALL_ENTRY:
178-
intent.setAction(MySettings.ACTION_NAVI_CALL_ENTRY_CHANGED);
179-
intent.putExtra(MySettings.EXTRA_NAVI_CALL_ENTRY_STRING, sharedPreferences.getString(key, ""));
180137
break; */
181138
case MySettings.ACC_ON_CALL_OPTION:
182139
intent.setAction(MySettings.ACTION_ACC_ON_CALL_OPTION_CHANGED);
@@ -194,12 +151,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
194151
intent.setAction(MySettings.ACTION_ACC_OFF_CALL_ENTRY_CHANGED);
195152
intent.putExtra(MySettings.EXTRA_ACC_OFF_CALL_ENTRY_STRING, sharedPreferences.getString(key, ""));
196153
break;
197-
/* case MySettings.SHOW_CPU_TEMP:
198-
intent.setAction(MySettings.ACTION_SHOW_CPU_TEMP_CHANGED);
199-
intent.putExtra(MySettings.EXTRA_SHOW_CPU_TEMP_ENABLED, sharedPreferences.getBoolean(key, false));
200-
toastText = "BOOLEAN_KEY";
201-
additionalText = "\nWait up to 1 minute for the update of the time in the status bar";
202-
break; */
203154
default:
204155
Log.d(TAG, "Invalid setting encountered");
205156
break;
@@ -225,5 +176,4 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
225176

226177
}
227178

228-
229179
}

‎app/src/main/java/org/hvdw/fytfunctionalityextender/Utils.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import android.content.pm.PackageManager;
1010
import android.content.SharedPreferences;
1111

12-
import android.net.Uri;
13-
import android.os.Bundle;
1412
import android.preference.PreferenceManager;
1513
import android.util.Log;
1614

@@ -20,14 +18,6 @@
2018
import java.io.InputStream;
2119
import java.io.ByteArrayOutputStream;
2220

23-
import java.io.File;
24-
import java.io.FileOutputStream;
25-
import java.io.IOException;
26-
import java.io.InputStream;
27-
import java.io.OutputStream;
28-
29-
import android.app.AlertDialog;
30-
import android.content.DialogInterface;
3121

3222
class Utils {
3323
private static Context mContext = null;
@@ -41,20 +31,6 @@ public static void init (Context context) {
4131
return;
4232
mContext = context;
4333
sharedprefs = PreferenceManager.getDefaultSharedPreferences(mContext);
44-
// backward compatible
45-
/*if(!mPrefer.getBoolean(PREF_COMPATIBLE, false))
46-
{
47-
SharedPreferences prefer = mContext.getSharedPreferences(PREFER, Context.MODE_WORLD_READABLE);
48-
if(prefer.contains(AUTOMODE))
49-
mPrefer.edit().putBoolean(AUTOMODE, prefer.getBoolean(AUTOMODE, false)).commit();
50-
if(prefer.contains(FAVORMASKVALUE))
51-
mPrefer.edit().putInt(FAVORMASKVALUE, prefer.getInt(FAVORMASKVALUE, 250)).commit();
52-
if(prefer.contains(PROXIMITYMAX))
53-
mPrefer.edit().putFloat(PROXIMITYMAX, prefer.getFloat(PROXIMITYMAX, ProximitySensor.DEFAULT_DISTANCE)).commit();
54-
if(prefer.contains(PROXIMITYMIN))
55-
mPrefer.edit().putFloat(PROXIMITYMIN, prefer.getFloat(PROXIMITYMIN, ProximitySensor.DEFAULT_DISTANCE)).commit();
56-
mPrefer.edit().putBoolean(PREF_COMPATIBLE, true).commit();
57-
} */
5834
}
5935

6036
/**********************************************************************************************************************************************/

‎app/src/main/res/xml/preferences.xml‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -16,86 +16,6 @@
1616
</PreferenceCategory>
1717
<!-- </PreferenceScreen> -->
1818

19-
<!-- <PreferenceScreen
20-
android:title="@string/app_keymod_settings"
21-
android:key="app_keymod_settings">
22-
<PreferenceScreen
23-
android:title="@string/dvd_key_settings"
24-
android:key="dvd_key_settings">
25-
<PreferenceCategory
26-
android:title="@string/dvd_key_category"
27-
android:key="dvd_key_category">
28-
<ListPreference
29-
android:key="dvd_key_call_option"
30-
android:entries="@array/key_call_entries"
31-
android:entryValues="@array/key_call_values"
32-
android:defaultValue="pkgname"
33-
android:title="@string/dvd_key_call_title" />
34-
<EditTextPreference
35-
android:dependency="dvd_key_call_option"
36-
android:key="dvd_key_entry"
37-
android:title="@string/dvd_key_text_title"
38-
android:defaultValue="com.syu.dvd" />
39-
</PreferenceCategory>
40-
</PreferenceScreen>
41-
<PreferenceScreen
42-
android:title="@string/eq_key_settings"
43-
android:key="eq_key_settings">
44-
<PreferenceCategory
45-
android:title="@string/eq_key_category"
46-
android:key="eq_key_category">
47-
<ListPreference
48-
android:key="eq_key_call_option"
49-
android:entries="@array/key_call_entries"
50-
android:entryValues="@array/key_call_values"
51-
android:defaultValue="pkgname"
52-
android:title="@string/eq_key_call_title" />
53-
<EditTextPreference
54-
android:dependency="eq_key_call_option"
55-
android:key="eq_key_entry"
56-
android:title="@string/eq_key_text_title"
57-
android:defaultValue="com.syu.eq" />
58-
</PreferenceCategory>
59-
</PreferenceScreen>
60-
<PreferenceScreen
61-
android:title="@string/media_key_settings"
62-
android:key="media_key_settings">
63-
<PreferenceCategory
64-
android:title="@string/media_key_category"
65-
android:key="media_key_category">
66-
<ListPreference
67-
android:key="media_key_call_option"
68-
android:entries="@array/key_call_entries"
69-
android:entryValues="@array/key_call_values"
70-
android:defaultValue="pkgname"
71-
android:title="@string/media_key_call_title" />
72-
<EditTextPreference
73-
android:dependency="media_key_call_option"
74-
android:key="media_key_entry"
75-
android:title="@string/media_key_text_title"
76-
android:defaultValue="com.syu.music" />
77-
</PreferenceCategory>
78-
</PreferenceScreen>
79-
<PreferenceScreen
80-
android:title="@string/navi_key_settings"
81-
android:key="navi_key_settings">
82-
<PreferenceCategory
83-
android:title="@string/navi_key_category"
84-
android:key="navi_key_category">
85-
<ListPreference
86-
android:key="navi_key_call_option"
87-
android:entries="@array/key_call_entries"
88-
android:entryValues="@array/key_call_values"
89-
android:defaultValue="pkgname"
90-
android:title="@string/navi_key_call_title" />
91-
<EditTextPreference
92-
android:dependency="navi_key_call_option"
93-
android:key="navi_key_entry"
94-
android:title="@string/navi_key_text_title"
95-
android:defaultValue="com.syu.onekeynavi" />
96-
</PreferenceCategory>
97-
</PreferenceScreen>
98-
</PreferenceScreen> -->
9919
<PreferenceScreen
10020
android:title="@string/acc_on_settings"
10121
android:key="acc_on_settings">

0 commit comments

Comments
 (0)