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

Remove Activity service (flutter/engine#3136)

Browse Source 
This functionality has been replaced by the PlatformPlugin. Also move the
contents of //flutter/services/common to more sensible homes.
This commit is contained in:
Adam Barth
2016-10-14 16:12:01 -07:00
committed by GitHub
parent 7b42d06850
commit d12cedb0a6
13 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ android_library("java") {
visibility = [ ":*" ]
java_files = [
"io/flutter/plugin/common/ActivityLifecycleListener.java",
"io/flutter/plugin/common/JSONMessageListener.java",
"io/flutter/plugin/platform/PlatformPlugin.java",
"io/flutter/view/AccessibilityBridge.java",
@@ -71,6 +72,7 @@ android_library("java") {
"io/flutter/view/FlutterView.java",
"io/flutter/view/ResourceCleaner.java",
"io/flutter/view/ResourceExtractor.java",
"io/flutter/view/ResourcePaths.java",
"io/flutter/view/ServiceFactory.java",
"io/flutter/view/ServiceProviderImpl.java",
"io/flutter/view/ServiceRegistry.java",
@@ -80,9 +82,6 @@ android_library("java") {
deps = [
"//base:base_java",
"//flutter/services/activity:activity_lib",
"//flutter/services/activity:interfaces_java",
"//flutter/services/common:common_lib",
"//flutter/services/editing:editing_lib",
"//flutter/services/editing:interfaces_java",
"//flutter/services/engine:interfaces_java",

9
engine/src/flutter/shell/platform/android/io/flutter/plugin/common/ActivityLifecycleListener.java Normal file
View File

@@ -0,0 +1,9 @@
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.plugin.common;
public interface ActivityLifecycleListener {
void onPostResume();
}

2
engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
View File

@@ -12,10 +12,10 @@ import android.os.Build;
import android.view.HapticFeedbackConstants;
import android.view.SoundEffectConstants;
import android.view.View;
import io.flutter.plugin.common.ActivityLifecycleListener;
import io.flutter.plugin.common.JSONMessageListener;
import io.flutter.view.FlutterView;
import org.chromium.base.PathUtils;
import org.domokit.common.ActivityLifecycleListener;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

9
engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java
View File

@@ -34,10 +34,8 @@ import org.chromium.mojo.bindings.Interface.Binding;
import org.chromium.mojo.system.Core;
import org.chromium.mojo.system.impl.CoreImpl;
import org.chromium.mojo.system.MessagePipeHandle;
import org.chromium.mojom.activity.Activity;
import org.chromium.mojom.editing.Clipboard;
import org.chromium.mojom.vsync.VSyncProvider;
import org.domokit.activity.ActivityImpl;
import org.domokit.editing.ClipboardImpl;
import org.domokit.vsync.VSyncProviderImpl;
@@ -184,13 +182,6 @@ public class FlutterMain {
private static native void nativeRecordStartTimestamp(long initTimeMillis);
private static void onServiceRegistryAvailable(final Context applicationContext, ServiceRegistry registry) {
registry.register(Activity.MANAGER.getName(), new ServiceFactory() {
@Override
public Binding connectToService(FlutterView view, Core core, MessagePipeHandle pipe) {
return Activity.MANAGER.bind(new ActivityImpl(), pipe);
}
});
registry.register(Clipboard.MANAGER.getName(), new ServiceFactory() {
@Override
public Binding connectToService(FlutterView view, Core core, MessagePipeHandle pipe) {

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

@@ -60,10 +60,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import io.flutter.plugin.common.ActivityLifecycleListener;
import io.flutter.plugin.platform.PlatformPlugin;
import org.domokit.common.ActivityLifecycleListener;
import org.domokit.activity.ActivityImpl;
import org.domokit.editing.KeyboardImpl;
import org.domokit.editing.KeyboardViewState;
import org.domokit.raw_keyboard.RawKeyboardServiceImpl;
@@ -105,10 +104,6 @@ public class FlutterView extends SurfaceView
public FlutterView(Context context, AttributeSet attrs) {
super(context, attrs);
// TODO(abarth): Remove this static and instead make everything that
// depends on it into a view-associated service.
ActivityImpl.setCurrentActivity((Activity) context);
mMetrics = new ViewportMetrics();
mMetrics.devicePixelRatio = context.getResources().getDisplayMetrics().density;
setFocusable(true);

2
engine/src/flutter/shell/platform/android/io/flutter/view/ResourceCleaner.java
View File

@@ -13,8 +13,6 @@ import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import org.domokit.common.ResourcePaths;
/**
* A class to clean up orphaned resource directories after unclean shutdowns.
**/

21
engine/src/flutter/shell/platform/android/io/flutter/view/ResourcePaths.java Normal file
View File

@@ -0,0 +1,21 @@
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package io.flutter.view;
import android.content.Context;
import java.io.File;
import java.io.IOException;
class ResourcePaths {
// The filename prefix used by Chromium temporary file APIs.
public static final String TEMPORARY_RESOURCE_PREFIX = ".org.chromium.Chromium.";
// Return a temporary file that will be cleaned up by the ResourceCleaner.
public static File createTempFile(Context context, String suffix) throws IOException {
return File.createTempFile(TEMPORARY_RESOURCE_PREFIX, "_" + suffix,
context.getCacheDir());
}
}

1
engine/src/flutter/shell/platform/darwin/common/BUILD.gn
View File

@@ -21,7 +21,6 @@ source_set("common") {
"//base:i18n",
"//dart/runtime:libdart",
"//flutter/runtime",
"//flutter/services/activity",
"//flutter/services/editing",
"//flutter/services/engine:interfaces",
"//flutter/services/platform",

6
engine/src/flutter/shell/platform/darwin/common/platform_service_provider.cc
View File

@@ -5,7 +5,6 @@
#include "flutter/shell/platform/darwin/common/platform_service_provider.h"
#if TARGET_OS_IPHONE
#include "flutter/services/activity/ios/activity_impl.h"
#include "flutter/services/editing/ios/clipboard_impl.h"
#include "flutter/services/vsync/ios/vsync_provider_ios_impl.h"
#else
@@ -24,11 +23,6 @@ void PlatformServiceProvider::ConnectToService(
const mojo::String& service_name,
mojo::ScopedMessagePipeHandle client_handle) {
#if TARGET_OS_IPHONE
if (service_name == ::activity::Activity::Name_) {
new sky::services::activity::ActivityImpl(
mojo::InterfaceRequest<::activity::Activity>(client_handle.Pass()));
return;
}
if (service_name == ::editing::Clipboard::Name_) {
new sky::services::editing::ClipboardImpl(
mojo::InterfaceRequest<::editing::Clipboard>(client_handle.Pass()));

1
engine/src/flutter/shell/platform/darwin/ios/BUILD.gn
View File

@@ -49,7 +49,6 @@ shared_library("flutter_framework_dylib") {
"//base:base",
"//dart/runtime:libdart",
"//flutter/lib/ui",
"//flutter/services/activity",
"//flutter/services/editing",
"//flutter/services/engine:interfaces",
"//flutter/services/platform",

4
engine/src/flutter/sky/BUILD.gn
View File

@@ -16,8 +16,4 @@ group("sky") {
if (dart_host_toolchain == host_toolchain) {
deps += [ "//flutter/snapshotter($dart_host_toolchain)" ]
}
if (is_android) {
deps += [ "//flutter/services/activity" ]
}
}

6
engine/src/flutter/sky/packages/flutter_services/lib/activity.dart
View File

@@ -1,6 +0,0 @@
/// Copyright 2016 The Chromium Authors. All rights reserved.
/// Use of this source code is governed by a BSD-style license that can be
/// found in the LICENSE file.
import 'package:sky_services/activity/activity.mojom.dart';
export 'package:sky_services/activity/activity.mojom.dart';

1
engine/src/flutter/sky/packages/sky_services/BUILD.gn
View File

@@ -23,7 +23,6 @@ dart_pkg("sky_services") {
deps = [
":copy_sky_services_license",
"//flutter/services/activity:interfaces",
"//flutter/services/editing:interfaces",
"//flutter/services/platform:interfaces",
"//flutter/services/raw_keyboard:interfaces",