diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-31 16:33:56 -0700 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2012-10-31 16:57:39 -0700 |
commit | 37dfa8109d0147a076bdc64bca696a494dce756e (patch) | |
tree | 8e65371958c484a0469fb8b53ccadb1edb7b0e8b /src/com/android/gallery3d/app/ActivityState.java | |
parent | 1d0d5cbf663a76f5cb2769621d39a83256943de9 (diff) | |
download | android_packages_apps_Snap-37dfa8109d0147a076bdc64bca696a494dce756e.tar.gz android_packages_apps_Snap-37dfa8109d0147a076bdc64bca696a494dce756e.tar.bz2 android_packages_apps_Snap-37dfa8109d0147a076bdc64bca696a494dce756e.zip |
Use the system-standard long press vibration pattern
Bug: 7216819
Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index 2e440df25..e74c0174f 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -18,15 +18,13 @@ package com.android.gallery3d.app; import android.app.Activity; import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; import android.os.BatteryManager; import android.os.Bundle; -import android.provider.Settings; -import android.provider.Settings.SettingNotFoundException; +import android.view.HapticFeedbackConstants; import android.view.Window; import android.view.WindowManager; @@ -63,9 +61,6 @@ abstract public class ActivityState { public Intent resultData; } - protected boolean mHapticsEnabled; - private ContentResolver mContentResolver; - private boolean mDestroyed = false; private boolean mPlugged = false; boolean mIsFinishing = false; @@ -93,7 +88,6 @@ abstract public class ActivityState { void initialize(AbstractGalleryActivity activity, Bundle data) { mActivity = activity; mData = data; - mContentResolver = activity.getAndroidContext().getContentResolver(); } public Bundle getData() { @@ -185,6 +179,11 @@ abstract public class ActivityState { } } + protected void performHapticFeedback(int feedbackConstant) { + mActivity.getWindow().getDecorView().performHapticFeedback(feedbackConstant, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + } + protected void onPause() { if (0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED)) { ((Activity) mActivity).unregisterReceiver(mPowerIntentReceiver); @@ -232,13 +231,6 @@ abstract public class ActivityState { activity.registerReceiver(mPowerIntentReceiver, filter); } - try { - mHapticsEnabled = Settings.System.getInt(mContentResolver, - Settings.System.HAPTIC_FEEDBACK_ENABLED) != 0; - } catch (SettingNotFoundException e) { - mHapticsEnabled = false; - } - onResume(); // the transition store should be cleared after resume; |