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

Commit 3caf9258 authored by Justin Koh's avatar Justin Koh Committed by Android (Google) Code Review
Browse files

Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

parents ed23c5bc 1aa59f86

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -28379,7 +28379,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;