am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2

* commit 'bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
  Add a preference panel for mouse speed.

4 files changed, 222 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 07e2fe7..2e82e3a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,6 +49,7 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.STATUS_BAR" />
     <uses-permission android:name="android.permission.MANAGE_USB" />
+    <uses-permission android:name="android.permission.SET_POINTER_SPEED" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bd35438..7808b63 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2384,6 +2384,10 @@ found in the list of installed applications.</string>
     card numbers.  It comes from the application
     <xliff:g id="ime_application_name">%1$s</xliff:g>.
     Use this input method?</string>
+    <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+    <string name="pointer_settings_category">Mouse and trackpad settings</string>
+    <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+    <string name="pointer_speed">Pointer speed</string>
 
     <!-- User dictionary settings --><skip />
     <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index b7934e6..37d4661 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -72,4 +72,12 @@
                 <intent android:action="android.settings.INPUT_METHOD_SETTINGS"/>
         </PreferenceScreen>
     </PreferenceCategory>
+
+    <PreferenceCategory android:key="pointer_settings_category"
+            android:title="@string/pointer_settings_category">
+        <com.android.settings.PointerSpeedPreference
+                android:key="pointer_speed"
+                android:title="@string/pointer_speed"
+                android:dialogTitle="@string/pointer_speed" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/android/settings/PointerSpeedPreference.java b/src/com/android/settings/PointerSpeedPreference.java
new file mode 100644
index 0000000..e9704fd
--- /dev/null
+++ b/src/com/android/settings/PointerSpeedPreference.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2011 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;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.SeekBarPreference;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
+import android.util.AttributeSet;
+import android.view.IWindowManager;
+import android.view.View;
+import android.widget.SeekBar;
+
+public class PointerSpeedPreference extends SeekBarPreference implements
+        SeekBar.OnSeekBarChangeListener {
+    private SeekBar mSeekBar;
+
+    private int mOldSpeed;
+    private boolean mRestoredOldState;
+
+    private boolean mTouchInProgress;
+
+    private static final int MIN_SPEED = -7;
+    private static final int MAX_SPEED = 7;
+
+    private ContentObserver mSpeedObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            onSpeedChanged();
+        }
+    };
+
+    public PointerSpeedPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        getContext().getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.POINTER_SPEED), true,
+                mSpeedObserver);
+
+        mRestoredOldState = false;
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        mSeekBar = getSeekBar(view);
+        mSeekBar.setMax(MAX_SPEED - MIN_SPEED);
+        mOldSpeed = getSpeed(0);
+        mSeekBar.setProgress(mOldSpeed - MIN_SPEED);
+        mSeekBar.setOnSeekBarChangeListener(this);
+    }
+
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
+        if (!mTouchInProgress) {
+            setSpeed(progress + MIN_SPEED);
+        }
+    }
+
+    public void onStartTrackingTouch(SeekBar seekBar) {
+        mTouchInProgress = true;
+    }
+
+    public void onStopTrackingTouch(SeekBar seekBar) {
+        mTouchInProgress = false;
+        setSpeed(seekBar.getProgress() + MIN_SPEED);
+    }
+
+    private int getSpeed(int defaultValue) {
+        int speed = defaultValue;
+        try {
+            speed = Settings.System.getInt(getContext().getContentResolver(),
+                    Settings.System.POINTER_SPEED);
+        } catch (SettingNotFoundException snfe) {
+        }
+        return speed;
+    }
+
+    private void onSpeedChanged() {
+        int speed = getSpeed(0);
+        mSeekBar.setProgress(speed - MIN_SPEED);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        final ContentResolver resolver = getContext().getContentResolver();
+
+        if (positiveResult) {
+            Settings.System.putInt(resolver, Settings.System.POINTER_SPEED,
+                    mSeekBar.getProgress() + MIN_SPEED);
+        } else {
+            restoreOldState();
+        }
+
+        resolver.unregisterContentObserver(mSpeedObserver);
+    }
+
+    private void restoreOldState() {
+        if (mRestoredOldState) return;
+
+        setSpeed(mOldSpeed);
+        mRestoredOldState = true;
+    }
+
+    private void setSpeed(int speed) {
+        try {
+            IWindowManager wm = IWindowManager.Stub.asInterface(
+                    ServiceManager.getService("window"));
+            if (wm != null) {
+                wm.setPointerSpeed(speed);
+            }
+        } catch (RemoteException e) {
+        }
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (getDialog() == null || !getDialog().isShowing()) return superState;
+
+        // Save the dialog state
+        final SavedState myState = new SavedState(superState);
+        myState.progress = mSeekBar.getProgress();
+        myState.oldSpeed = mOldSpeed;
+
+        // Restore the old state when the activity or dialog is being paused
+        restoreOldState();
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        mOldSpeed = myState.oldSpeed;
+        mSeekBar.setProgress(myState.progress);
+        setSpeed(myState.progress + MIN_SPEED);
+    }
+
+    private static class SavedState extends BaseSavedState {
+        int progress;
+        int oldSpeed;
+
+        public SavedState(Parcel source) {
+            super(source);
+            progress = source.readInt();
+            oldSpeed = source.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(progress);
+            dest.writeInt(oldSpeed);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
+