am ae8fcaf4: Merge "Use platform delay for assist long press gesture" into mnc-dev

* commit 'ae8fcaf4c320dbf68db7dc032269692806150d99':
  Use platform delay for assist long press gesture
This commit is contained in:
Jorim Jaggi
2015-05-13 21:45:13 +00:00
committed by Android Git Automerger
2 changed files with 2 additions and 5 deletions

View File

@@ -69,9 +69,6 @@
<!-- Show rotation lock toggle in System UI-->
<bool name="config_showRotationLock">true</bool>
<!-- Amount of time to hold off before showing the search panel when the user presses home -->
<integer name="config_show_search_delay">200</integer>
<!-- Vibration duration for GlowPadView used in SearchPanelView -->
<integer translatable="false" name="config_vibration_duration">0</integer>

View File

@@ -79,6 +79,7 @@ import android.view.MotionEvent;
import android.view.ThreadedRenderer;
import android.view.VelocityTracker;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup.LayoutParams;
import android.view.ViewStub;
import android.view.WindowManager;
@@ -1197,8 +1198,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
private void updateShowSearchHoldoff() {
mShowSearchHoldoff = mContext.getResources().getInteger(
R.integer.config_show_search_delay);
mShowSearchHoldoff = ViewConfiguration.getLongPressTimeout();
}
private void updateNotificationShade() {