From c40e07993a1cd6edae2f1f3198e8ceb780b64c52 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 29 Jul 2011 15:17:41 -0700
Subject: [PATCH 1/3] Added accessibility tutorial-specific class name for
 instructions.

Bug: 5087316
Change-Id: Ia41e9c73af189f36dd6b92b21fcbc5e9bcf408f3
---
 .../accessibility_tutorial_container.xml               |  3 ++-
 res/layout/accessibility_tutorial_container.xml        |  3 ++-
 .../settings/AccessibilityTutorialActivity.java        | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
index d649354b459..f5da706cb7c 100644
--- a/res/layout-sw600dp/accessibility_tutorial_container.xml
+++ b/res/layout-sw600dp/accessibility_tutorial_container.xml
@@ -57,7 +57,8 @@
         <View
             style="@style/AccessibilityTutorialDivider" />
 
-        <TextView
+        <view
+            class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
             android:id="@+id/instructions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml
index 4ee72f539ca..6566cfffb0e 100644
--- a/res/layout/accessibility_tutorial_container.xml
+++ b/res/layout/accessibility_tutorial_container.xml
@@ -47,7 +47,8 @@
             android:focusable="false"
             android:clickable="false" />
 
-        <TextView
+        <view
+            class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
             android:id="@+id/instructions"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
index 9ea9917205f..e04a1ea8822 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;
@@ -655,4 +656,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);
+        }
+    }
 }

From f40770096fe75180fba679ed349a63d195729c0c Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Fri, 26 Aug 2011 17:10:32 -0700
Subject: [PATCH 2/3] Add a "show touches" option for demos and presentations.
 Bug: 4569045

Change-Id: Ie074dbdc61c8e30222113edebdb2e4d5a83020e5
---
 res/values/strings.xml                           |  5 +++++
 res/xml/development_prefs.xml                    |  5 +++++
 .../android/settings/DevelopmentSettings.java    | 16 ++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b01898518c..1214d2fbbd9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3398,6 +3398,11 @@ found in the list of installed applications.</string>
     <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
     <string name="pointer_location_summary">Screen overlay showing current touch data</string>
 
+    <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+    <string name="show_touches">Show touches</string>
+    <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+    <string name="show_touches_summary">Show visual feedback for touches</string>
+
     <!-- UI debug setting: show where screen updates happen? [CHAR LIMIT=25] -->
     <string name="show_screen_updates">Show screen updates</string>
     <!-- UI debug setting: show screen updates summary [CHAR LIMIT=50] -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 0f8dfbcdb79..b65c2e58b0b 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -63,6 +63,11 @@
             android:title="@string/pointer_location"
             android:summary="@string/pointer_location_summary"/>
 
+        <CheckBoxPreference
+            android:key="show_touches"
+            android:title="@string/show_touches"
+            android:summary="@string/show_touches_summary"/>
+
         <CheckBoxPreference
             android:key="show_screen_updates"
             android:title="@string/show_screen_updates"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index d93c333134d..bdbec978fd5 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) {

From c883ee5eaae1666f8321cfcc3058fb3843e695dc Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 29 Aug 2011 12:22:35 -0700
Subject: [PATCH 3/3] Small improvements for issue #5225666

Sort disabled apps to the bottom of the list to make them easier to
find together.

Also change the order of the tabs because with the new layout anything
after the third tab is buried so put all apps at the end so the running
tab is more visible.

Change-Id: Id022fdbf366505cf0da3fb9a6270c3f2e2704d51
---
 .../android/settings/applications/ApplicationsState.java  | 3 +++
 .../android/settings/applications/ManageApplications.java | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index e0899cb11c8..799b34a2170 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 747b406f0bc..c2e68ddcc94 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);