merge from open-source master
Change-Id: I0a74758673231384186e810f7371900a09b73800
This commit is contained in:
@@ -20,7 +20,6 @@ import android.os.Bundle;
|
|||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.PreferenceActivity;
|
import android.preference.PreferenceActivity;
|
||||||
import android.preference.PreferenceGroup;
|
import android.preference.PreferenceGroup;
|
||||||
import android.telephony.TelephonyManager;
|
|
||||||
|
|
||||||
public class Settings extends PreferenceActivity {
|
public class Settings extends PreferenceActivity {
|
||||||
|
|
||||||
@@ -38,8 +37,6 @@ public class Settings extends PreferenceActivity {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
addPreferencesFromResource(R.xml.settings);
|
addPreferencesFromResource(R.xml.settings);
|
||||||
|
|
||||||
int activePhoneType = TelephonyManager.getDefault().getPhoneType();
|
|
||||||
|
|
||||||
PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
|
PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
|
||||||
Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
|
Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
|
||||||
|
Reference in New Issue
Block a user