firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved io.flutter.embedding.engine.android package to io.flutter.embedding.android (flutter/engine#8221)

Browse Source
This commit is contained in:
Matt Carroll
2019-03-20 11:30:49 -07:00
committed by GitHub
parent 09b936d0c2
commit 23bfa08262
12 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@@ -467,16 +467,16 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEven
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/AndroidKeyProcessor.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/AndroidTouchProcessor.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterActivity.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterFragment.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterSurfaceView.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterTextureView.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterView.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java

14
engine/src/flutter/shell/platform/android/BUILD.gn
View File

@@ -109,16 +109,16 @@ java_library("flutter_shell_java") {
"io/flutter/app/FlutterApplication.java",
"io/flutter/app/FlutterFragmentActivity.java",
"io/flutter/app/FlutterPluginRegistry.java",
"io/flutter/embedding/android/AndroidKeyProcessor.java",
"io/flutter/embedding/android/AndroidTouchProcessor.java",
"io/flutter/embedding/android/FlutterActivity.java",
"io/flutter/embedding/android/FlutterFragment.java",
"io/flutter/embedding/android/FlutterSurfaceView.java",
"io/flutter/embedding/android/FlutterTextureView.java",
"io/flutter/embedding/android/FlutterView.java",
"io/flutter/embedding/engine/FlutterEngine.java",
"io/flutter/embedding/engine/FlutterJNI.java",
"io/flutter/embedding/engine/FlutterShellArgs.java",
"io/flutter/embedding/engine/android/AndroidKeyProcessor.java",
"io/flutter/embedding/engine/android/AndroidTouchProcessor.java",
"io/flutter/embedding/engine/android/FlutterActivity.java",
"io/flutter/embedding/engine/android/FlutterFragment.java",
"io/flutter/embedding/engine/android/FlutterSurfaceView.java",
"io/flutter/embedding/engine/android/FlutterTextureView.java",
"io/flutter/embedding/engine/android/FlutterView.java",
"io/flutter/embedding/engine/dart/DartExecutor.java",
"io/flutter/embedding/engine/dart/DartMessenger.java",
"io/flutter/embedding/engine/dart/PlatformMessageHandler.java",

2
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/AndroidKeyProcessor.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

6
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/AndroidTouchProcessor.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
View File

@@ -1,4 +1,4 @@
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.os.Build;
import android.support.annotation.IntDef;
@@ -164,7 +164,9 @@ public class AndroidTouchProcessor {
// ACTION_HOVER_MOVE always applies to a single pointer only.
addPointerForIndex(event, event.getActionIndex(), pointerChange, 0, packet);
assert(packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0);
if (packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0) {
throw new AssertionError("Packet position is not on field boundary.");
}
renderer.dispatchPointerDataPacket(packet, packet.position());
return true;
}

2
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterActivity.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.content.Context;
import android.content.Intent;

2
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterFragment.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.content.Context;
import android.content.Intent;

4
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterSurfaceView.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.content.Context;
import android.support.annotation.NonNull;
@@ -12,8 +12,6 @@ import android.util.Log;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import java.nio.ByteBuffer;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
/**

4
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterTextureView.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.content.Context;
import android.graphics.SurfaceTexture;
@@ -13,8 +13,6 @@ import android.util.Log;
import android.view.Surface;
import android.view.TextureView;
import java.nio.ByteBuffer;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
/**

6
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterView.java → engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.embedding.engine.android;
package io.flutter.embedding.android;
import android.annotation.TargetApi;
import android.content.Context;
@@ -10,7 +10,6 @@ import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.Build;
import android.os.LocaleList;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
@@ -20,7 +19,6 @@ import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.WindowInsets;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeProvider;
import android.view.inputmethod.EditorInfo;
@@ -33,10 +31,8 @@ import java.util.Locale;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
import io.flutter.plugin.editing.TextInputPlugin;
import io.flutter.view.AccessibilityBridge;
import io.flutter.view.VsyncWaiter;
/**
* Displays a Flutter UI on an Android device.

3
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
View File

@@ -15,6 +15,7 @@ import android.view.Surface;
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicLong;
import io.flutter.embedding.android.FlutterView;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.view.TextureRegistry;
@@ -29,7 +30,7 @@ import io.flutter.view.TextureRegistry;
* code via JNI. The corresponding {@link RenderSurface} is used as a delegate to carry out
* certain actions on behalf of this {@code FlutterRenderer} within an Android view hierarchy.
*
* {@link io.flutter.embedding.engine.android.FlutterView} is an implementation of a {@link RenderSurface}.
* {@link FlutterView} is an implementation of a {@link RenderSurface}.
*/
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public class FlutterRenderer implements TextureRegistry {

5
engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java
View File

@@ -15,7 +15,6 @@ import android.graphics.SurfaceTexture;
import android.os.Build;
import android.os.Handler;
import android.os.LocaleList;
import android.provider.Settings;
import android.support.annotation.RequiresApi;
import android.text.format.DateFormat;
import android.util.AttributeSet;
@@ -28,8 +27,8 @@ import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import io.flutter.app.FlutterPluginRegistry;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.embedding.engine.android.AndroidKeyProcessor;
import io.flutter.embedding.engine.android.AndroidTouchProcessor;
import io.flutter.embedding.android.AndroidKeyProcessor;
import io.flutter.embedding.android.AndroidTouchProcessor;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;

2
engine/src/flutter/tools/android_lint/baseline.xml
View File

@@ -480,7 +480,7 @@
errorLine1=" public boolean onTouchEvent(MotionEvent event) {"
errorLine2=" ~~~~~~~~~~~~">
<location
file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterView.java"
file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java"
line="311"
column="18"/>
</issue>