diff --git a/res/values/strings.xml b/res/values/strings.xml index 8c7b6f4789f..31a059aeac3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -793,6 +793,9 @@ Accounts Location + + Use location + Accounts @@ -1722,6 +1725,9 @@ Turn on Wi\u2011Fi Wi\u2011Fi + + + Use Wi\u2011Fi Wi\u2011Fi settings @@ -4394,6 +4400,12 @@ Click after pointer stops moving Delay before click + + Use service + + Use color correction + + Use captions ON @@ -5049,6 +5061,9 @@ Battery Saver + + Use Battery Saver + Turn on automatically @@ -8720,6 +8735,9 @@ Storage manager + + Use Storage manager + Automatic diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index 3606b8ebbee..fbbdfad03ba 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -158,6 +158,8 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment final boolean enabled = mCaptioningManager.isEnabled(); SettingsActivity activity = (SettingsActivity) getActivity(); mSwitchBar = activity.getSwitchBar(); + mSwitchBar.setSwitchBarText(R.string.accessibility_caption_master_switch_title, + R.string.accessibility_caption_master_switch_title); mSwitchBar.setCheckedInternal(enabled); mToggleSwitch = mSwitchBar.getSwitch(); diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 146f69791e8..69044aa8679 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -93,6 +93,12 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF mSwitchBar.removeOnSwitchChangeListener(this); } + @Override + protected void updateSwitchBarText(SwitchBar switchBar) { + switchBar.setSwitchBarText(R.string.accessibility_daltonizer_master_switch_title, + R.string.accessibility_daltonizer_master_switch_title); + } + private void initPreferences() { final String value = Integer.toString( Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE)); diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 85d3a2f2776..7dacbb08684 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -23,6 +23,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.view.View; +import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; @@ -55,6 +56,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference SettingsActivity activity = (SettingsActivity) getActivity(); mSwitchBar = activity.getSwitchBar(); + updateSwitchBarText(mSwitchBar); mToggleSwitch = mSwitchBar.getSwitch(); onProcessArguments(getArguments()); @@ -83,6 +85,12 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference removeActionBarToggleSwitch(); } + protected void updateSwitchBarText(SwitchBar switchBar) { + // Implement this to provide meaningful text in switch bar + switchBar.setSwitchBarText(R.string.accessibility_service_master_switch_title, + R.string.accessibility_service_master_switch_title); + } + protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled); protected void onInstallSwitchBarToggleSwitch() { diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index cb9e7507c66..184c0c57ae7 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -81,6 +81,8 @@ public class AutomaticStorageManagerSettings extends DashboardFragment private void initializeSwitchBar() { final SettingsActivity activity = (SettingsActivity) getActivity(); mSwitchBar = activity.getSwitchBar(); + mSwitchBar.setSwitchBarText(R.string.automatic_storage_manager_master_switch_title, + R.string.automatic_storage_manager_master_switch_title); mSwitchBar.show(); mSwitchController = new AutomaticStorageManagerSwitchBarController( diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java index 303f7674d41..2a4fd6ebd03 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -87,6 +87,8 @@ public class BatterySaverSettings extends SettingsPreferenceFragment .setTitle(com.android.internal.R.string.battery_saver_description); mContext = getActivity(); mSwitchBar = ((SettingsActivity) mContext).getSwitchBar(); + mSwitchBar.setSwitchBarText(R.string.battery_saver_master_switch_title, + R.string.battery_saver_master_switch_title); mSwitch = mSwitchBar.getSwitch(); mSwitchBar.show(); diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 1279d677c50..563352e6ce4 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -31,6 +31,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; @@ -91,8 +92,10 @@ public class LocationSettings extends DashboardFragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); final SettingsActivity activity = (SettingsActivity) getActivity(); - mSwitchBarController = new LocationSwitchBarController( - activity, activity.getSwitchBar(), getLifecycle()); + final SwitchBar switchBar = activity.getSwitchBar(); + switchBar.setSwitchBarText(R.string.location_settings_master_switch_title, + R.string.location_settings_master_switch_title); + mSwitchBarController = new LocationSwitchBarController(activity, switchBar, getLifecycle()); } @Override diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 73f17f7e8f6..95944f21f1c 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -190,6 +190,9 @@ public class WifiSettings extends RestrictedSettingsFragment .findViewById(R.id.progress_bar_animation); setProgressBarVisible(false); } + ((SettingsActivity) activity).getSwitchBar().setSwitchBarText( + R.string.wifi_settings_master_switch_title, + R.string.wifi_settings_master_switch_title); } @Override