PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove duplicate preferences in Accessibility settings."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-03 19:48:19 +00:00
committed by Android (Google) Code Review
parent 187ff21a7c 024668a2c5
commit d1a405e053
5 changed files with 120 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -28,8 +28,7 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
public abstract class ToggleFeaturePreferenceFragment
extends SettingsPreferenceFragment {
public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment {
protected SwitchBar mSwitchBar;
protected ToggleSwitch mToggleSwitch;
@@ -43,9 +42,7 @@ public abstract class ToggleFeaturePreferenceFragment
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final int resId = getPreferenceScreenResId();
if (usePreferenceScreenTitle() && resId > 0) {
addPreferencesFromResource(resId);
} else {
if (!usePreferenceScreenTitle() || resId <= 0) {
PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
getActivity());
setPreferenceScreen(preferenceScreen);

9
src/com/android/settings/applications/ManageDomainUrls.java
View File

@@ -63,9 +63,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setAnimationAllowed(true);
if (usePreferenceScreenTitle()) {
addPreferencesFromResource(R.xml.manage_domain_url_settings);
} else {
if (!usePreferenceScreenTitle()) {
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
}
mApplicationsState = ApplicationsState.getInstance(
@@ -74,6 +72,11 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
setHasOptionsMenu(true);
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.manage_domain_url_settings;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);

9
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -59,7 +59,9 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setAnimationAllowed(true);
addPreferencesFromResource(R.xml.unrestricted_data_access_settings);
if (!usePreferenceScreenTitle()) {
addPreferencesFromResource(R.xml.unrestricted_data_access_settings);
}
mApplicationsState = ApplicationsState.getInstance(
(Application) getContext().getApplicationContext());
mDataSaverBackend = new DataSaverBackend(getContext());
@@ -208,6 +210,11 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
return MetricsEvent.DATA_USAGE_UNRESTRICTED_ACCESS;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.unrestricted_data_access_settings;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference instanceof AccessPreference) {

6
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -51,6 +51,11 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index
return MetricsEvent.NFC_PAYMENT;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.nfc_payment_settings;
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -60,7 +65,6 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index
final PreferenceScreen screen;
if (usePreferenceScreenTitle()) {
addPreferencesFromResource(R.xml.nfc_payment_settings);
screen = getPreferenceScreen();
} else {
PreferenceManager manager = getPreferenceManager();