Skip to content

Commit

Permalink
Revert "Make FlutterActivity extend from FragmentActivity (flutter#3529
Browse files Browse the repository at this point in the history
…)" (flutter#3545)

This reverts commit fa360b5.
  • Loading branch information
collinjackson authored Mar 31, 2017
1 parent a8a4a9f commit 0005285
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
8 changes: 0 additions & 8 deletions shell/platform/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,8 @@ shared_library("flutter_shell_native") {
]
}

java_prebuilt("android_support_v4") {
jar_path = "//third_party/android_tools/sdk/extras/android/support/v4/android-support-v4.jar"
}

java_library("flutter_shell_java") {
supports_android = true
bypass_platform_checks = true

java_files = [
"io/flutter/app/FlutterActivity.java",
Expand Down Expand Up @@ -106,11 +101,8 @@ java_library("flutter_shell_java") {
]

jar_path = "$root_out_dir/flutter_java.jar"

deps = [":android_support_v4"]
}


copy("flutter_shell_assets") {
visibility = [ ":*" ]

Expand Down
4 changes: 2 additions & 2 deletions shell/platform/android/io/flutter/app/FlutterActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

package io.flutter.app;

import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.Window;
import android.view.WindowManager;
import io.flutter.plugin.platform.PlatformPlugin;
Expand All @@ -19,7 +19,7 @@
/**
* Base class for activities that use Flutter.
*/
public class FlutterActivity extends FragmentActivity {
public class FlutterActivity extends Activity {
private FlutterView flutterView;

private String[] getArgsFromIntent(Intent intent) {
Expand Down

0 comments on commit 0005285

Please sign in to comment.