summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-25 23:22:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-25 23:22:04 +0000
commit3c007368a7341ecc81b5e79d3fc46786413d4c6e (patch)
tree322c0e4bbb8ab02e03c36273ab81898f53cc10db /src
parentefe84750930e369763d73a76c647695d7e600bee (diff)
parent9e7d2acc22fdf76c8a1a55d7bb7c6eb5fc72b18d (diff)
downloadandroid_packages_apps_Trebuchet-3c007368a7341ecc81b5e79d3fc46786413d4c6e.tar.gz
android_packages_apps_Trebuchet-3c007368a7341ecc81b5e79d3fc46786413d4c6e.tar.bz2
android_packages_apps_Trebuchet-3c007368a7341ecc81b5e79d3fc46786413d4c6e.zip
Merge "Cleanup unnecessary override dump method" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/AbstractFloatingView.java4
-rw-r--r--src/com/android/launcher3/dragndrop/DragController.java5
-rw-r--r--src/com/android/launcher3/touch/AbstractStateChangeTouchController.java5
-rw-r--r--src/com/android/launcher3/util/TouchController.java2
4 files changed, 1 insertions, 15 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index bd584996c..d6f992f51 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -41,7 +41,6 @@ import com.android.launcher3.util.TouchController;
import com.android.launcher3.views.ActivityContext;
import com.android.launcher3.views.BaseDragLayer;
-import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -252,7 +251,4 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
@FloatingViewType int type) {
return getOpenView(activity, type);
}
-
- @Override
- public void dump(String prefix, PrintWriter writer) { }
}
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 5c3d4fbbf..72107596a 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -46,7 +46,6 @@ import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.TouchController;
import com.android.launcher3.util.UiThreadHelper;
-import java.io.PrintWriter;
import java.util.ArrayList;
/**
@@ -697,8 +696,4 @@ public class DragController implements DragDriver.EventListener, TouchController
public void removeDropTarget(DropTarget target) {
mDropTargets.remove(target);
}
-
- @Override
- public void dump(String prefix, PrintWriter writer) { }
-
}
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 34654a93b..a1871ff37 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -50,8 +50,6 @@ import com.android.launcher3.util.FlingBlockCheck;
import com.android.launcher3.util.PendingAnimation;
import com.android.launcher3.util.TouchController;
-import java.io.PrintWriter;
-
/**
* TouchController for handling state changes
*/
@@ -583,7 +581,4 @@ public abstract class AbstractStateChangeTouchController
this.endTime = duration + SystemClock.elapsedRealtime();
}
}
-
- @Override
- public void dump(String prefix, PrintWriter writer) { }
}
diff --git a/src/com/android/launcher3/util/TouchController.java b/src/com/android/launcher3/util/TouchController.java
index ac6a5bdcf..fc1d819f7 100644
--- a/src/com/android/launcher3/util/TouchController.java
+++ b/src/com/android/launcher3/util/TouchController.java
@@ -32,5 +32,5 @@ public interface TouchController {
*/
boolean onControllerInterceptTouchEvent(MotionEvent ev);
- void dump(String prefix, PrintWriter writer);
+ default void dump(String prefix, PrintWriter writer) { }
}