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

Commit a13a17ee authored May 05, 2014 by Justin Koh Committed by Android Git Automerger May 05, 2014

am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

* commit 'fd04632a':
  Hide getDeviceGlobalActionKeyTimeout

parents 19f274f6 fd04632a

api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30982,7 +30982,6 @@ package android.view {
	public class ViewConfiguration {		public class ViewConfiguration {
	ctor public deprecated ViewConfiguration();		ctor public deprecated ViewConfiguration();
	method public static android.view.ViewConfiguration get(android.content.Context);		method public static android.view.ViewConfiguration get(android.content.Context);
	method public long getDeviceGlobalActionKeyTimeout();
	method public static int getDoubleTapTimeout();		method public static int getDoubleTapTimeout();
	method public static deprecated int getEdgeSlop();		method public static deprecated int getEdgeSlop();
	method public static deprecated int getFadingEdgeLength();		method public static deprecated int getFadingEdgeLength();

core/java/android/view/ViewConfiguration.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -702,8 +702,9 @@ public class ViewConfiguration {
	*		*
	* @return how long a user needs to press the relevant key to bring up		* @return how long a user needs to press the relevant key to bring up
	* the global actions dialog.		* the global actions dialog.
	* @deprecated use getDeviceGlobalActionKeyTimeout		* @deprecated
	*/		*/
			@Deprecated
	public static long getGlobalActionKeyTimeout() {		public static long getGlobalActionKeyTimeout() {
	return GLOBAL_ACTIONS_KEY_TIMEOUT;		return GLOBAL_ACTIONS_KEY_TIMEOUT;
	}		}
	@@ -714,6 +715,7 @@ public class ViewConfiguration {
	*		*
	* @return how long a user needs to press the relevant key to bring up		* @return how long a user needs to press the relevant key to bring up
	* the global actions dialog.		* the global actions dialog.
			* @hide
	*/		*/
	public long getDeviceGlobalActionKeyTimeout() {		public long getDeviceGlobalActionKeyTimeout() {
	return mGlobalActionsKeyTimeout;		return mGlobalActionsKeyTimeout;