diff options
Diffstat (limited to 'src')
4 files changed, 33 insertions, 4 deletions
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java index da8350c..5039970 100644 --- a/src/com/android/settings/AccessibilityTutorialActivity.java +++ b/src/com/android/settings/AccessibilityTutorialActivity.java @@ -27,6 +27,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.provider.Settings; +import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -661,4 +662,13 @@ public class AccessibilityTutorialActivity extends Activity { mFinish.setVisibility(visible ? VISIBLE : GONE); } } + + /** + * Provides a tutorial-specific class name for fired accessibility events. + */ + public static class TutorialTextView extends TextView { + public TutorialTextView(Context context, AttributeSet attrs) { + super(context, attrs); + } + } } diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index d93c333..bdbec97 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -59,6 +59,7 @@ public class DevelopmentSettings extends PreferenceFragment private static final String STRICT_MODE_KEY = "strict_mode"; private static final String POINTER_LOCATION_KEY = "pointer_location"; + private static final String SHOW_TOUCHES_KEY = "show_touches"; private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates"; private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage"; private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale"; @@ -80,6 +81,7 @@ public class DevelopmentSettings extends PreferenceFragment private CheckBoxPreference mStrictMode; private CheckBoxPreference mPointerLocation; + private CheckBoxPreference mShowTouches; private CheckBoxPreference mShowScreenUpdates; private CheckBoxPreference mShowCpuUsage; private ListPreference mWindowAnimationScale; @@ -112,6 +114,7 @@ public class DevelopmentSettings extends PreferenceFragment mStrictMode = (CheckBoxPreference) findPreference(STRICT_MODE_KEY); mPointerLocation = (CheckBoxPreference) findPreference(POINTER_LOCATION_KEY); + mShowTouches = (CheckBoxPreference) findPreference(SHOW_TOUCHES_KEY); mShowScreenUpdates = (CheckBoxPreference) findPreference(SHOW_SCREEN_UPDATES_KEY); mShowCpuUsage = (CheckBoxPreference) findPreference(SHOW_CPU_USAGE_KEY); mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY); @@ -155,6 +158,7 @@ public class DevelopmentSettings extends PreferenceFragment updatePasswordSummary(); updateStrictModeVisualOptions(); updatePointerLocationOptions(); + updateShowTouchesOptions(); updateFlingerOptions(); updateCpuUsageOptions(); updateAnimationScaleOptions(); @@ -229,6 +233,16 @@ public class DevelopmentSettings extends PreferenceFragment Settings.System.POINTER_LOCATION, 0) != 0); } + private void writeShowTouchesOptions() { + Settings.System.putInt(getActivity().getContentResolver(), + Settings.System.SHOW_TOUCHES, mShowTouches.isChecked() ? 1 : 0); + } + + private void updateShowTouchesOptions() { + mShowTouches.setChecked(Settings.System.getInt(getActivity().getContentResolver(), + Settings.System.SHOW_TOUCHES, 0) != 0); + } + private void updateFlingerOptions() { // magic communication with surface flinger. try { @@ -406,6 +420,8 @@ public class DevelopmentSettings extends PreferenceFragment writeStrictModeVisualOptions(); } else if (preference == mPointerLocation) { writePointerLocationOptions(); + } else if (preference == mShowTouches) { + writeShowTouchesOptions(); } else if (preference == mShowScreenUpdates) { writeFlingerOptions(); } else if (preference == mShowCpuUsage) { diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java index e0899cb..799b34a 100644 --- a/src/com/android/settings/applications/ApplicationsState.java +++ b/src/com/android/settings/applications/ApplicationsState.java @@ -153,6 +153,9 @@ public class ApplicationsState { private final Collator sCollator = Collator.getInstance(); @Override public int compare(AppEntry object1, AppEntry object2) { + if (object1.info.enabled != object2.info.enabled) { + return object1.info.enabled ? -1 : 1; + } return sCollator.compare(object1.label, object2.label); } }; diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 747b406..c2e68dd 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -628,10 +628,6 @@ public class ManageApplications extends Fragment implements .setIndicator(getActivity().getString(R.string.filter_apps_third_party), getActivity().getResources().getDrawable(R.drawable.ic_tab_download)) .setContent(this)); - tabHost.addTab(tabHost.newTabSpec(TAB_ALL) - .setIndicator(getActivity().getString(R.string.filter_apps_all), - getActivity().getResources().getDrawable(R.drawable.ic_tab_all)) - .setContent(this)); if (!Environment.isExternalStorageEmulated()) { tabHost.addTab(tabHost.newTabSpec(TAB_SDCARD) .setIndicator(getActivity().getString(R.string.filter_apps_onsdcard), @@ -642,6 +638,10 @@ public class ManageApplications extends Fragment implements .setIndicator(getActivity().getString(R.string.filter_apps_running), getActivity().getResources().getDrawable(R.drawable.ic_tab_running)) .setContent(this)); + tabHost.addTab(tabHost.newTabSpec(TAB_ALL) + .setIndicator(getActivity().getString(R.string.filter_apps_all), + getActivity().getResources().getDrawable(R.drawable.ic_tab_all)) + .setContent(this)); tabHost.setCurrentTabByTag(mDefaultTab); tabHost.setOnTabChangedListener(this); |