diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-15 15:55:33 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-15 15:55:33 -0700 |
commit | 5160536df91bb9daa6cac9a878ce406deda791c6 (patch) | |
tree | 10e5c1582288347810fbc02266bf75d7db52785a /src/com/android/settings/accessibility | |
parent | c2e2f77739ade726832c433063a075626ba316c4 (diff) | |
download | packages_apps_Settings-5160536df91bb9daa6cac9a878ce406deda791c6.zip packages_apps_Settings-5160536df91bb9daa6cac9a878ce406deda791c6.tar.gz packages_apps_Settings-5160536df91bb9daa6cac9a878ce406deda791c6.tar.bz2 |
Code refactoring
- move ToggleSwitch to the widget package
Change-Id: Id277fc11c78363bf7d7b229ef9ae91c1ec5d6774
Diffstat (limited to 'src/com/android/settings/accessibility')
8 files changed, 9 insertions, 66 deletions
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index 810b8b5..43306f2 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import android.app.ActionBar; -import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; @@ -41,7 +40,8 @@ import com.android.internal.widget.SubtitleView; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; +import com.android.settings.widget.ToggleSwitch; +import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; import java.util.Locale; diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index db473f8..7f0bb41 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -37,7 +37,8 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; +import com.android.settings.widget.ToggleSwitch; +import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; import java.util.Collections; import java.util.HashSet; diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 384aafc..6da81b0 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -16,14 +16,10 @@ package com.android.settings.accessibility; -import android.accessibilityservice.AccessibilityService; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceScreen; -import android.preference.SeekBarPreference; import android.provider.Settings; import android.view.View; import android.view.accessibility.AccessibilityManager; @@ -31,7 +27,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import com.android.settings.R; -import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 6558cc7..55e3199 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import android.app.ActionBar; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Color; @@ -37,6 +36,7 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.widget.ToggleSwitch; public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java index f4ac2cc..56680b8 100644 --- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java @@ -18,7 +18,8 @@ package com.android.settings.accessibility; import android.provider.Settings; -import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; +import com.android.settings.widget.ToggleSwitch; +import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; public class ToggleGlobalGesturePreferenceFragment extends ToggleFeaturePreferenceFragment { diff --git a/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java index 92a778e..88c6caf 100644 --- a/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java @@ -16,21 +16,15 @@ package com.android.settings.accessibility; -import android.accessibilityservice.AccessibilityService; import android.os.Bundle; import android.preference.CheckBoxPreference; -import android.preference.ListPreference; import android.preference.Preference; -import android.preference.PreferenceScreen; -import android.preference.SeekBarPreference; import android.provider.Settings; import android.view.View; -import android.view.accessibility.AccessibilityManager; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import com.android.settings.R; -import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; public class ToggleInversionPreferenceFragment extends ToggleFeaturePreferenceFragment implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 27d07d2..0e8926a 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -18,7 +18,8 @@ package com.android.settings.accessibility; import android.provider.Settings; -import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; +import com.android.settings.widget.ToggleSwitch; +import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; public class ToggleScreenMagnificationPreferenceFragment extends ToggleFeaturePreferenceFragment { diff --git a/src/com/android/settings/accessibility/ToggleSwitch.java b/src/com/android/settings/accessibility/ToggleSwitch.java deleted file mode 100644 index e7c39e4..0000000 --- a/src/com/android/settings/accessibility/ToggleSwitch.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.accessibility; - -import android.content.Context; -import android.widget.Switch; - -public class ToggleSwitch extends Switch { - private ToggleSwitch.OnBeforeCheckedChangeListener mOnBeforeListener; - - public static interface OnBeforeCheckedChangeListener { - public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked); - } - - public ToggleSwitch(Context context) { - super(context); - } - - public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) { - mOnBeforeListener = listener; - } - - @Override - public void setChecked(boolean checked) { - if (mOnBeforeListener != null - && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) { - return; - } - super.setChecked(checked); - } - - public void setCheckedInternal(boolean checked) { - super.setChecked(checked); - } -} |