diff options
author | Joe Onorato <joeo@android.com> | 2010-06-24 17:49:44 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-06-24 17:49:44 -0700 |
commit | 8932020f542ae6dd4750fa823bbf2d2bcf504267 (patch) | |
tree | c199716678b9c9360b723666e0961df6cfe69c6a /tests | |
parent | 7fd22aab4506f65b7929ed1030bdd71c56f7db77 (diff) | |
download | frameworks_base-8932020f542ae6dd4750fa823bbf2d2bcf504267.zip frameworks_base-8932020f542ae6dd4750fa823bbf2d2bcf504267.tar.gz frameworks_base-8932020f542ae6dd4750fa823bbf2d2bcf504267.tar.bz2 |
Fix the notification vibration setting and add a test app that lets you recover from the busted
state.
Bug: 2767349
Change-Id: Id0c41734e82a1256a49175a2dc6b40f0abaf4f8b
Diffstat (limited to 'tests')
-rw-r--r-- | tests/FixVibrateSetting/Android.mk | 11 | ||||
-rw-r--r-- | tests/FixVibrateSetting/AndroidManifest.xml | 14 | ||||
-rw-r--r-- | tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png | bin | 0 -> 1057 bytes | |||
-rw-r--r-- | tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png | bin | 0 -> 651 bytes | |||
-rw-r--r-- | tests/FixVibrateSetting/res/layout/fix_vibrate.xml | 46 | ||||
-rw-r--r-- | tests/FixVibrateSetting/res/values/strings.xml | 25 | ||||
-rw-r--r-- | tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java | 123 |
7 files changed, 219 insertions, 0 deletions
diff --git a/tests/FixVibrateSetting/Android.mk b/tests/FixVibrateSetting/Android.mk new file mode 100644 index 0000000..2a88e5a --- /dev/null +++ b/tests/FixVibrateSetting/Android.mk @@ -0,0 +1,11 @@ +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) diff --git a/tests/FixVibrateSetting/AndroidManifest.xml b/tests/FixVibrateSetting/AndroidManifest.xml new file mode 100644 index 0000000..007d682 --- /dev/null +++ b/tests/FixVibrateSetting/AndroidManifest.xml @@ -0,0 +1,14 @@ +<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> diff --git a/tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png b/tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png Binary files differnew file mode 100644 index 0000000..37c8853 --- /dev/null +++ b/tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png diff --git a/tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png b/tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png Binary files differnew file mode 100644 index 0000000..be00f47 --- /dev/null +++ b/tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png diff --git a/tests/FixVibrateSetting/res/layout/fix_vibrate.xml b/tests/FixVibrateSetting/res/layout/fix_vibrate.xml new file mode 100644 index 0000000..c505e65 --- /dev/null +++ b/tests/FixVibrateSetting/res/layout/fix_vibrate.xml @@ -0,0 +1,46 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + > + + <TextView android:id="@+id/current_setting" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="30dp" + android:layout_marginBottom="50dp" + android:paddingLeft="8dp" + android:paddingTop="4dp" + android:textSize="20sp" + android:textColor="#ffffffff" + /> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal" + > + <Button android:id="@+id/fix" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/fix" + /> + + <Button android:id="@+id/unfix" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/unfix" + /> + </LinearLayout> + + <Button android:id="@+id/test" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/test" + /> + +</LinearLayout> + diff --git a/tests/FixVibrateSetting/res/values/strings.xml b/tests/FixVibrateSetting/res/values/strings.xml new file mode 100644 index 0000000..269cef3 --- /dev/null +++ b/tests/FixVibrateSetting/res/values/strings.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2007 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. +--> + +<resources> + <string name="app_label">Fix Vibrate</string> + <string name="title">Fix vibrate setting</string> + <string name="current_setting">"Ringer: %1$s\nNotification: %2$s"</string> + <string name="fix">Fix the setting</string> + <string name="unfix">Break the setting</string> + <string name="test">Test the setting</string> +</resources> + diff --git a/tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java b/tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java new file mode 100644 index 0000000..947ea78 --- /dev/null +++ b/tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2008 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.fixvibratesetting; + +import android.app.Activity; +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.Intent; +import android.media.AudioManager; +import android.util.Log; +import android.view.View; +import android.widget.TextView; +import android.os.Bundle; + +public class FixVibrateSetting extends Activity implements View.OnClickListener +{ + AudioManager mAudioManager; + NotificationManager mNotificationManager; + TextView mCurrentSetting; + View mFix; + View mUnfix; + View mTest; + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + + setContentView(R.layout.fix_vibrate); + + mAudioManager = (AudioManager)getSystemService(AUDIO_SERVICE); + mNotificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); + + mCurrentSetting = (TextView)findViewById(R.id.current_setting); + + mFix = findViewById(R.id.fix); + mFix.setOnClickListener(this); + + mUnfix = findViewById(R.id.unfix); + mUnfix.setOnClickListener(this); + + mTest = findViewById(R.id.test); + mTest.setOnClickListener(this); + } + + @Override + public void onResume() { + super.onResume(); + + update(); + } + + private String getSettingValue(int vibrateType) { + int setting = mAudioManager.getVibrateSetting(vibrateType); + switch (setting) { + case AudioManager.VIBRATE_SETTING_OFF: + return "off"; + case AudioManager.VIBRATE_SETTING_ON: + return "on"; + case AudioManager.VIBRATE_SETTING_ONLY_SILENT: + return "silent-only"; + default: + return "unknown"; + } + } + + public void onClick(View v) { + if (v == mFix) { + fix(); + update(); + } else if (v == mUnfix) { + unfix(); + update(); + } else if (v == mTest) { + test(); + update(); + } + } + + private void update() { + String ringer = getSettingValue(AudioManager.VIBRATE_TYPE_RINGER); + String notification = getSettingValue(AudioManager.VIBRATE_TYPE_NOTIFICATION); + String text = getString(R.string.current_setting, ringer, notification); + mCurrentSetting.setText(text); + } + + private void fix() { + mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION, + AudioManager.VIBRATE_SETTING_ON); + } + + private void unfix() { + mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION, + AudioManager.VIBRATE_SETTING_OFF); + } + + private void test() { + Notification n = new Notification(R.drawable.stat_sys_warning, "Test notification", + System.currentTimeMillis()); + Intent intent = new Intent(this, FixVibrateSetting.class); + PendingIntent pending = PendingIntent.getActivity(this, 0, intent, 0); + n.setLatestEventInfo(this, "Test notification", "Test notification", pending); + + n.vibrate = new long[] { 0, 700, 500, 1000 }; + n.flags |= Notification.FLAG_AUTO_CANCEL; + mNotificationManager.notify(1, n); + } +} + |