Rename VulkanViewer to Viewer, take 2.

Also puts Window and Application in sk_app namespace.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003

Review-Url: https://codereview.chromium.org/1945103003

4 files changed, 10 insertions, 10 deletions

diff --git a/platform_tools/android/apps/settings.gradle b/platform_tools/android/apps/settings.gradle
index 9d103b49be..d462ca8bbb 100644
--- a/platform_tools/android/apps/settings.gradle
+++ b/platform_tools/android/apps/settings.gradle
@@ -2,4 +2,4 @@ include ':sample_app'
 include ':visualbench'
 include ':visualbenchsdl'
 include ':canvasproof'
-include ':vulkanviewer'
+include ':viewer'
diff --git a/platform_tools/android/apps/vulkanviewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle
index 731be4c3da..79cac8a7d4 100644
--- a/platform_tools/android/apps/vulkanviewer/build.gradle
+++ b/platform_tools/android/apps/viewer/build.gradle
@@ -9,7 +9,7 @@ android {
     compileSdkVersion 19
     buildToolsVersion "22.0.1"
     defaultConfig {
-        applicationId "org.skia.vulkanviewer"
+        applicationId "org.skia.viewer"
         minSdkVersion 19
         targetSdkVersion 19
         versionCode 1
@@ -20,5 +20,5 @@ android {
     sourceSets.main.jniLibs.srcDir "src/main/libs"
     productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; }
 
-    setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyVulkanViewerDeps", true)
+    setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyViewerDeps", true)
 }
diff --git a/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml b/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml
index 634c737083..2ed88e1da6 100644
--- a/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.skia.vulkanviewer"
+          package="org.skia.viewer"
           android:versionCode="1"
           android:versionName="1.0">
 
   <application
       android:allowBackup="false"
-      android:label="VulkanViewer">
+      android:label="Viewer">
 
-    <activity android:name=".VulkanViewerActivity"
-              android:label="VulkanViewer"
+    <activity android:name=".ViewerActivity"
+              android:label="Viewer"
               android:screenOrientation="portrait"
               android:configChanges="orientation|keyboardHidden">
       <meta-data android:name="android.app.lib_name"
-                 android:value="vulkanviewer" />
+                 android:value="viewer" />
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
diff --git a/platform_tools/android/apps/vulkanviewer/src/main/java/org/skia/vulkanviewer/VulkanViewerActivity.java b/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
index 38554ffdea..950d6b2d5b 100644
--- a/platform_tools/android/apps/vulkanviewer/src/main/java/org/skia/vulkanviewer/VulkanViewerActivity.java
+++ b/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-package org.skia.vulkanviewer;
+package org.skia.viewer;
 
 import android.app.ActionBar;
 import android.os.Bundle;
@@ -13,7 +13,7 @@ import android.provider.Settings;
 import android.view.View;
 import android.view.WindowManager;
 
-public class VulkanViewerActivity extends android.app.NativeActivity {
+public class ViewerActivity extends android.app.NativeActivity {
     static {
         System.loadLibrary("skia_android");
     }