Make all the Settings Switches appear again
- use the ActionBar Theme context when creating the Switch for
getting the correct Theming
Change-Id: Ic3701c53662b0f245c7149b119de8bb5cbaae232
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 685dee5..76776cd 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -368,7 +368,7 @@
super.onActivityCreated(savedInstanceState);
final Activity activity = getActivity();
- mEnabledSwitch = new Switch(activity);
+ mEnabledSwitch = new Switch(activity.getActionBar().getThemedContext());
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 1575bee..41cd75d 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -86,7 +86,7 @@
final Activity activity = getActivity();
mBackend = new DreamBackend(activity);
- mSwitch = new Switch(activity);
+ mSwitch = new Switch(activity.getActionBar().getThemedContext());
mSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
diff --git a/src/com/android/settings/ZenModeSettings.java b/src/com/android/settings/ZenModeSettings.java
index 51b43fd..f6c7b8c 100644
--- a/src/com/android/settings/ZenModeSettings.java
+++ b/src/com/android/settings/ZenModeSettings.java
@@ -67,7 +67,7 @@
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
mActivity = getActivity();
- mSwitch = new Switch(mActivity);
+ mSwitch = new Switch(mActivity.getActionBar().getThemedContext());
final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
mSwitch.setPadding(0, 0, p, 0);
setHasOptionsMenu(true);
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index b707e7b..b505a3f 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -117,7 +117,7 @@
final Activity activity = getActivity();
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
- mSwitch = new Switch(activity);
+ mSwitch = new Switch(activity.getActionBar().getThemedContext());
mSwitch.setPaddingRelative(0, 0, padding, 0);
mBluetoothEnabler = new BluetoothEnabler(activity, mSwitch);
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index d862fd7..1549bbd 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -73,7 +73,7 @@
final Activity activity = getActivity();
- mSwitch = new Switch(activity);
+ mSwitch = new Switch(activity.getActionBar().getThemedContext());
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mSwitch.setPaddingRelative(0, 0, padding, 0);
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index b3cd9c2..f289550 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -42,7 +42,7 @@
super.onCreate(savedInstanceState);
Activity activity = getActivity();
- mActionBarSwitch = new Switch(activity);
+ mActionBarSwitch = new Switch(activity.getActionBar().getThemedContext());
if (activity instanceof SettingsActivity) {
final int padding = activity.getResources().getDimensionPixelSize(
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 3bba963..0d7444a 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -294,7 +294,7 @@
mPrintersAdapter = new PrintersAdapter();
mPrintersAdapter.registerDataSetObserver(mDataObserver);
- mToggleSwitch = createActionBarToggleSwitch(getActivity());
+ mToggleSwitch = createActionBarToggleSwitch(getActivity().getActionBar().getThemedContext());
mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
@Override
public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
@@ -445,9 +445,9 @@
}
}
- private ToggleSwitch createActionBarToggleSwitch(Activity activity) {
- ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
- final int padding = activity.getResources().getDimensionPixelSize(
+ private ToggleSwitch createActionBarToggleSwitch(Context context) {
+ ToggleSwitch toggleSwitch = new ToggleSwitch(context);
+ final int padding = context.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
toggleSwitch.setPaddingRelative(0, 0, padding, 0);
return toggleSwitch;
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 0215ad8..2f8d22b 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -50,7 +50,6 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.Switch;
import android.widget.TextView;
@@ -72,8 +71,6 @@
public class PrintSettingsFragment extends SettingsPreferenceFragment
implements DialogCreatable, Indexable {
- static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
-
private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
private static final String PRINT_JOBS_CATEGORY = "print_jobs_category";