Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bf5cce9 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 0a0edcca: Merge "Fix the notification vibration setting and add a test app... 

am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread

Merge commit '0a0edcca' into gingerbread-plus-aosp

* commit '0a0edcca':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
parents ea8eafad 0a0edcca

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -952,7 +952,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            int vibrate = 0;

            int vibrate = 0;

            vibrate = AudioService.getValueForVibrateSetting(vibrate,

            vibrate = AudioService.getValueForVibrateSetting(vibrate,

                    AudioManager.VIBRATE_TYPE_NOTIFICATION, AudioManager.VIBRATE_SETTING_ON);

                    AudioManager.VIBRATE_TYPE_NOTIFICATION, AudioManager.VIBRATE_SETTING_ON);

            vibrate = AudioService.getValueForVibrateSetting(vibrate,

            vibrate |= AudioService.getValueForVibrateSetting(vibrate,

                    AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);

                    AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);

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

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

        } finally {

        } finally {

tests/FixVibrateSetting/Android.mk

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
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)

tests/FixVibrateSetting/AndroidManifest.xml

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
<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>

tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png

0 → 100644
+1.03 KiB
Loading image diff...

tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png

0 → 100644
+651 B
Loading image diff...