Merge "Fix the notification vibration setting and add a test app that lets you...

            int vibrate = 0;

            vibrate = AudioService.getValueForVibrateSetting(vibrate,

                    AudioManager.VIBRATE_TYPE_NOTIFICATION, AudioManager.VIBRATE_SETTING_ON);

            vibrate = AudioService.getValueForVibrateSetting(vibrate,

            vibrate |= AudioService.getValueForVibrateSetting(vibrate,

                    AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);

            loadSetting(stmt, Settings.System.VIBRATE_ON, vibrate);

        } finally {

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := FixVibrateSetting

LOCAL_CERTIFICATE := platform

include $(BUILD_PACKAGE)

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.fixvibratesetting">

    <uses-permission android:name="android.permission.VIBRATE" />

    <application>

        <activity android:name="FixVibrateSetting" android:label="@string/app_label">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>