commit ea25120849ae9f8705b33755dea9b4aae410ff01
author Jorge Betancourt <jmbetancourt@google.com> Mon Jun 29 11:09:55 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 29 20:04:24 2020 +0000
tree 1ac418796686b62a1d929e0ff6f733bcd1eda504
parent 0c24320f917fd820b7ba7eeac3d5a25d21e7dfc1

Clean up skottielib: modify access to package classes and delete unneeded code

Change-Id: I86bff8efde4bdcd269c0c9940643926f9362dff7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299596
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Jorge Betancourt <jmbetancourt@google.com>

platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieApplication.java

diff --git a/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieApplication.java b/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieApplication.java
deleted file mode 100644
index cd34180..0000000
--- a/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieApplication.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-package org.skia.skottie;
-import android.app.Application;
-
-public class SkottieApplication extends Application {
-
-    static {
-        System.loadLibrary("skottie_android");
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-    }
-}

platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieRunner.java

diff --git a/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieRunner.java b/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieRunner.java
index 416650b..3a26b76 100644
--- a/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieRunner.java
+++ b/platform_tools/android/apps/skottie/skottielib/src/main/java/org/skia/skottie/SkottieRunner.java
@@ -33,7 +33,7 @@
 import javax.microedition.khronos.egl.EGLDisplay;
 import javax.microedition.khronos.egl.EGLSurface;
 
-public class SkottieRunner {
+class SkottieRunner {
     private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
     private static final int EGL_OPENGL_ES2_BIT = 4;
     private static final int STENCIL_BUFFER_SIZE = 8;
@@ -51,6 +51,9 @@
     private EGLSurface mPBufferSurface;
     private long mNativeProxy;
 
+    static {
+        System.loadLibrary("skottie_android");
+    }
     /**
      * Gets SkottieRunner singleton instance.
      */

platform_tools/android/apps/skottie/src/main/AndroidManifest.xml

diff --git a/platform_tools/android/apps/skottie/src/main/AndroidManifest.xml b/platform_tools/android/apps/skottie/src/main/AndroidManifest.xml
index c8c1d76..5f19d60 100644
--- a/platform_tools/android/apps/skottie/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/skottie/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     android:versionName="1.0">
 
     <application
-        android:name=".SkottieApplication"
         android:allowBackup="false"
         android:label="Skottie"
         android:theme="@android:style/Theme.Holo.Light">

platform_tools/android/apps/skottie/src/main/java/org/skia/skottie/SkottieActivity.java

diff --git a/platform_tools/android/apps/skottie/src/main/java/org/skia/skottie/SkottieActivity.java b/platform_tools/android/apps/skottie/src/main/java/org/skia/skottie/SkottieActivity.java
index 6c9d077..1a35200 100644
--- a/platform_tools/android/apps/skottie/src/main/java/org/skia/skottie/SkottieActivity.java
+++ b/platform_tools/android/apps/skottie/src/main/java/org/skia/skottie/SkottieActivity.java
@@ -33,8 +33,6 @@
 
     private final static long TIME_OUT_MS = 10000;
 
-    private SkottieApplication mApplication;
-
     private CountDownLatch mEnterAnimationFence = new CountDownLatch(1);
 
     private GridLayout mGrid;