Skip to content

Commit 488fe09

Browse files
RBogieRBogie
authored
Revert "Moved io.flutter.embedding.engine.android package to io.flutter.embedding.android (flutter#8221)"
This reverts commit 76cbc0a.
1 parent 03d59b8 commit 488fe09

File tree

12 files changed

+35
-29
lines changed

12 files changed

+35
-29
lines changed

‎ci/licenses_golden/licenses_flutter

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -467,16 +467,16 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEven
467467
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java
468468
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
469469
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
470-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java
471-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
472-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
473-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
474-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
475-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
476-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
477470
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
478471
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
479472
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
473+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/AndroidKeyProcessor.java
474+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/AndroidTouchProcessor.java
475+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterActivity.java
476+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterFragment.java
477+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterSurfaceView.java
478+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterTextureView.java
479+
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterView.java
480480
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
481481
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
482482
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java

‎shell/platform/android/BUILD.gn

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,16 @@ java_library("flutter_shell_java") {
109109
"io/flutter/app/FlutterApplication.java",
110110
"io/flutter/app/FlutterFragmentActivity.java",
111111
"io/flutter/app/FlutterPluginRegistry.java",
112-
"io/flutter/embedding/android/AndroidKeyProcessor.java",
113-
"io/flutter/embedding/android/AndroidTouchProcessor.java",
114-
"io/flutter/embedding/android/FlutterActivity.java",
115-
"io/flutter/embedding/android/FlutterFragment.java",
116-
"io/flutter/embedding/android/FlutterSurfaceView.java",
117-
"io/flutter/embedding/android/FlutterTextureView.java",
118-
"io/flutter/embedding/android/FlutterView.java",
119112
"io/flutter/embedding/engine/FlutterEngine.java",
120113
"io/flutter/embedding/engine/FlutterJNI.java",
121114
"io/flutter/embedding/engine/FlutterShellArgs.java",
115+
"io/flutter/embedding/engine/android/AndroidKeyProcessor.java",
116+
"io/flutter/embedding/engine/android/AndroidTouchProcessor.java",
117+
"io/flutter/embedding/engine/android/FlutterActivity.java",
118+
"io/flutter/embedding/engine/android/FlutterFragment.java",
119+
"io/flutter/embedding/engine/android/FlutterSurfaceView.java",
120+
"io/flutter/embedding/engine/android/FlutterTextureView.java",
121+
"io/flutter/embedding/engine/android/FlutterView.java",
122122
"io/flutter/embedding/engine/dart/DartExecutor.java",
123123
"io/flutter/embedding/engine/dart/DartMessenger.java",
124124
"io/flutter/embedding/engine/dart/PlatformMessageHandler.java",

‎shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/AndroidKeyProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
package io.flutter.embedding.android;
5+
package io.flutter.embedding.engine.android;
66

77
import android.support.annotation.NonNull;
88
import android.support.annotation.Nullable;

‎shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/AndroidTouchProcessor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.flutter.embedding.android;
1+
package io.flutter.embedding.engine.android;
22

33
import android.os.Build;
44
import android.support.annotation.IntDef;
@@ -164,9 +164,7 @@ public boolean onGenericMotionEvent(MotionEvent event) {
164164

165165
// ACTION_HOVER_MOVE always applies to a single pointer only.
166166
addPointerForIndex(event, event.getActionIndex(), pointerChange, 0, packet);
167-
if (packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0) {
168-
throw new AssertionError("Packet position is not on field boundary.");
169-
}
167+
assert(packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0);
170168
renderer.dispatchPointerDataPacket(packet, packet.position());
171169
return true;
172170
}

‎shell/platform/android/io/flutter/embedding/android/FlutterActivity.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/FlutterActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
package io.flutter.embedding.android;
5+
package io.flutter.embedding.engine.android;
66

77
import android.content.Context;
88
import android.content.Intent;

‎shell/platform/android/io/flutter/embedding/android/FlutterFragment.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/FlutterFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
package io.flutter.embedding.android;
5+
package io.flutter.embedding.engine.android;
66

77
import android.content.Context;
88
import android.content.Intent;

‎shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/FlutterSurfaceView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
package io.flutter.embedding.android;
5+
package io.flutter.embedding.engine.android;
66

77
import android.content.Context;
88
import android.support.annotation.NonNull;
@@ -12,6 +12,8 @@
1212
import android.view.SurfaceHolder;
1313
import android.view.SurfaceView;
1414

15+
import java.nio.ByteBuffer;
16+
1517
import io.flutter.embedding.engine.renderer.FlutterRenderer;
1618

1719
/**

‎shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/FlutterTextureView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
package io.flutter.embedding.android;
5+
package io.flutter.embedding.engine.android;
66

77
import android.content.Context;
88
import android.graphics.SurfaceTexture;
@@ -13,6 +13,8 @@
1313
import android.view.Surface;
1414
import android.view.TextureView;
1515

16+
import java.nio.ByteBuffer;
17+
1618
import io.flutter.embedding.engine.renderer.FlutterRenderer;
1719

1820
/**

‎shell/platform/android/io/flutter/embedding/android/FlutterView.java renamed to ‎shell/platform/android/io/flutter/embedding/engine/android/FlutterView.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
package io.flutter.embedding.android;
5+
package io.flutter.embedding.engine.android;
66

77
import android.annotation.TargetApi;
88
import android.content.Context;
99
import android.content.res.Configuration;
1010
import android.graphics.Rect;
1111
import android.os.Build;
1212
import android.os.LocaleList;
13+
import android.provider.Settings;
1314
import android.support.annotation.NonNull;
1415
import android.support.annotation.Nullable;
1516
import android.support.annotation.RequiresApi;
@@ -19,6 +20,7 @@
1920
import android.view.KeyEvent;
2021
import android.view.MotionEvent;
2122
import android.view.WindowInsets;
23+
import android.view.WindowManager;
2224
import android.view.accessibility.AccessibilityManager;
2325
import android.view.accessibility.AccessibilityNodeProvider;
2426
import android.view.inputmethod.EditorInfo;
@@ -31,8 +33,10 @@
3133

3234
import io.flutter.embedding.engine.FlutterEngine;
3335
import io.flutter.embedding.engine.renderer.FlutterRenderer;
36+
import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
3437
import io.flutter.plugin.editing.TextInputPlugin;
3538
import io.flutter.view.AccessibilityBridge;
39+
import io.flutter.view.VsyncWaiter;
3640

3741
/**
3842
* Displays a Flutter UI on an Android device.

‎shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.nio.ByteBuffer;
1616
import java.util.concurrent.atomic.AtomicLong;
1717

18-
import io.flutter.embedding.android.FlutterView;
1918
import io.flutter.embedding.engine.FlutterJNI;
2019
import io.flutter.view.TextureRegistry;
2120

@@ -30,7 +29,7 @@
3029
* code via JNI. The corresponding {@link RenderSurface} is used as a delegate to carry out
3130
* certain actions on behalf of this {@code FlutterRenderer} within an Android view hierarchy.
3231
*
33-
* {@link FlutterView} is an implementation of a {@link RenderSurface}.
32+
* {@link io.flutter.embedding.engine.android.FlutterView} is an implementation of a {@link RenderSurface}.
3433
*/
3534
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
3635
public class FlutterRenderer implements TextureRegistry {

‎shell/platform/android/io/flutter/view/FlutterView.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import android.os.Build;
1616
import android.os.Handler;
1717
import android.os.LocaleList;
18+
import android.provider.Settings;
1819
import android.support.annotation.RequiresApi;
1920
import android.text.format.DateFormat;
2021
import android.util.AttributeSet;
@@ -27,8 +28,8 @@
2728
import android.view.inputmethod.InputMethodManager;
2829
import io.flutter.app.FlutterPluginRegistry;
2930
import io.flutter.embedding.engine.FlutterJNI;
30-
import io.flutter.embedding.android.AndroidKeyProcessor;
31-
import io.flutter.embedding.android.AndroidTouchProcessor;
31+
import io.flutter.embedding.engine.android.AndroidKeyProcessor;
32+
import io.flutter.embedding.engine.android.AndroidTouchProcessor;
3233
import io.flutter.embedding.engine.dart.DartExecutor;
3334
import io.flutter.embedding.engine.renderer.FlutterRenderer;
3435
import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;

‎tools/android_lint/baseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@
480480
errorLine1=" public boolean onTouchEvent(MotionEvent event) {"
481481
errorLine2=" ~~~~~~~~~~~~">
482482
<location
483-
file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java"
483+
file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/android/FlutterView.java"
484484
line="311"
485485
column="18"/>
486486
</issue>

0 commit comments

Comments
 (0)