commit c86318585779eaaa0e4bb6c17dd4ecbc3cd431e3
author Siarhei Vishniakou <svv@google.com> Fri Jul 06 11:33:56 2018 +0100
committer Siarhei Vishniakou <svv@google.com> Wed Jul 11 09:56:43 2018 +0100
tree dacc892a51df3dfc147bfb01135f62b0cd5724d6
parent 8027876f9f6d97aad280cd0f0da7739c46a314b6

Move Viewport types to DisplayViewport

DisplayViewport.java should be as close to DisplayViewport.cpp as
possible, but currently, the constants are defined in
InputManagerService. Move them to DisplayViewport in preparation for
storing the type alongside the viewport.

Test: build only
Bug: 111108021
Change-Id: I5cc5e37723486310c8f211ecef975ff822812603

services/core/java/com/android/server/input/InputManagerService.java

diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 9df9ba6..2750dc1 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -16,6 +16,9 @@
 
 package com.android.server.input;
 
+import static android.hardware.display.DisplayViewport.VIEWPORT_INTERNAL;
+import static android.hardware.display.DisplayViewport.VIEWPORT_EXTERNAL;
+
 import android.annotation.NonNull;
 import android.os.LocaleList;
 import android.os.ShellCallback;
@@ -292,11 +295,6 @@
     /** Switch code: Camera lens cover. When set the lens is covered. */
     public static final int SW_CAMERA_LENS_COVER = 0x09;
 
-    // Viewport constants defined in InputReader.h.
-    public static final int VIEWPORT_DEFAULT = 1;
-    public static final int VIEWPORT_EXTERNAL = 2;
-    public static final int VIEWPORT_VIRTUAL = 3;
-
     public static final int SW_LID_BIT = 1 << SW_LID;
     public static final int SW_TABLET_MODE_BIT = 1 << SW_TABLET_MODE;
     public static final int SW_KEYPAD_SLIDE_BIT = 1 << SW_KEYPAD_SLIDE;
@@ -362,7 +360,7 @@
         updateAccessibilityLargePointerFromSettings();
     }
 
-    // TODO(BT) Pass in paramter for bluetooth system
+    // TODO(BT) Pass in parameter for bluetooth system
     public void systemRunning() {
         if (DEBUG) {
             Slog.d(TAG, "System ready.");
@@ -417,7 +415,7 @@
             DisplayViewport externalTouchViewport,
             List<DisplayViewport> virtualTouchViewports) {
         if (defaultViewport.valid) {
-            setDisplayViewport(VIEWPORT_DEFAULT, defaultViewport);
+            setDisplayViewport(VIEWPORT_INTERNAL, defaultViewport);
         }
 
         if (externalTouchViewport.valid) {