diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-05-13 21:42:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 21:42:16 +0000 |
| commit | ae8fcaf4c320dbf68db7dc032269692806150d99 (patch) | |
| tree | dfffc397faba49aa203db038da75db2223538789 /packages/SystemUI | |
| parent | 45fefaef008c16af42256fb2d8eab183245d030d (diff) | |
| parent | 3b028d754f26f7e7092db6346199e313b87412b1 (diff) | |
| download | frameworks_base-ae8fcaf4c320dbf68db7dc032269692806150d99.zip frameworks_base-ae8fcaf4c320dbf68db7dc032269692806150d99.tar.gz frameworks_base-ae8fcaf4c320dbf68db7dc032269692806150d99.tar.bz2 | |
Merge "Use platform delay for assist long press gesture" into mnc-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 6e79423..354e99d 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -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> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index f983f58..887b8f4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -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() { |