Use action bar widget context for accessibility toggle switches

Change-Id: I078968b3f4f59439743356e9fe241cdf385deef6

2 files changed, 10 insertions, 10 deletions

diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 49e31cf..810b8b5 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -129,11 +129,14 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
         mPreviewText = (SubtitleView) view.findViewById(R.id.preview_text);
         mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
 
-        final Context context = view.getContext();
+        final Context context = getActivity().getActionBar().getThemedContext();
         final int padding = context.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
         mToggleSwitch = new ToggleSwitch(context);
         mToggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        mToggleSwitch.setLayoutParams(new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER_VERTICAL | Gravity.END));
         mToggleSwitch.setCheckedInternal(enabled);
 
         mPreviewWindow = view.findViewById(R.id.preview_window);
@@ -220,11 +223,8 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
 
     private void installActionBarToggleSwitch() {
         final ActionBar ab = getActivity().getActionBar();
-        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
-                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.END);
         ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
-        ab.setCustomView(mToggleSwitch, params);
+        ab.setCustomView(mToggleSwitch);
 
         onInstallActionBarToggleSwitch();
     }
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 03f9072..a6901ad 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -88,11 +88,14 @@ public abstract class ToggleFeaturePreferenceFragment
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        final Context context = view.getContext();
+        final Context context = getActivity().getActionBar().getThemedContext();
         final int padding = context.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
         mToggleSwitch = new ToggleSwitch(context);
         mToggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        mToggleSwitch.setLayoutParams(new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER_VERTICAL | Gravity.END));
 
         onProcessArguments(getArguments());
     }
@@ -127,11 +130,8 @@ public abstract class ToggleFeaturePreferenceFragment
 
     private void installActionBarToggleSwitch() {
         final ActionBar ab = getActivity().getActionBar();
-        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
-                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
-                Gravity.CENTER_VERTICAL | Gravity.END);
         ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
-        ab.setCustomView(mToggleSwitch, params);
+        ab.setCustomView(mToggleSwitch);
 
         onInstallActionBarToggleSwitch();
     }