From cdddc471d7ad09b2434141a9a2e1fb28d5053c18 Mon Sep 17 00:00:00 2001
From: Jose Alba <jaguado@google.com>
Date: Tue, 17 Dec 2019 04:25:15 -0500
Subject: [PATCH] Fix apk release issue for new Flutter Gallery (#185)

* Fix apk release issue

* Removed TODO

* Removed TODO
---
 gallery/gallery/android/app/build.gradle                      | 3 +--
 gallery/gallery/android/app/src/debug/AndroidManifest.xml     | 2 +-
 gallery/gallery/android/app/src/main/AndroidManifest.xml      | 4 ++--
 .../{com/example => io/flutter/demo}/gallery/MainActivity.kt  | 2 +-
 gallery/gallery/pubspec.yaml                                  | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename gallery/gallery/android/app/src/main/kotlin/{com/example => io/flutter/demo}/gallery/MainActivity.kt (90%)

diff --git a/gallery/gallery/android/app/build.gradle b/gallery/gallery/android/app/build.gradle
index 67bc907af..2a761ab74 100644
--- a/gallery/gallery/android/app/build.gradle
+++ b/gallery/gallery/android/app/build.gradle
@@ -37,8 +37,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.gallery"
+        applicationId "io.flutter.demo.gallery"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
diff --git a/gallery/gallery/android/app/src/debug/AndroidManifest.xml b/gallery/gallery/android/app/src/debug/AndroidManifest.xml
index ef5f37de9..c03b348aa 100644
--- a/gallery/gallery/android/app/src/debug/AndroidManifest.xml
+++ b/gallery/gallery/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.gallery">
+    package="io.flutter.demo.gallery">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/gallery/gallery/android/app/src/main/AndroidManifest.xml b/gallery/gallery/android/app/src/main/AndroidManifest.xml
index 306e9c70e..2a6d1cd8a 100644
--- a/gallery/gallery/android/app/src/main/AndroidManifest.xml
+++ b/gallery/gallery/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.gallery">
+    package="io.flutter.demo.gallery">
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -12,9 +12,9 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- This keeps the window background of the activity showing
diff --git a/gallery/gallery/android/app/src/main/kotlin/com/example/gallery/MainActivity.kt b/gallery/gallery/android/app/src/main/kotlin/io/flutter/demo/gallery/MainActivity.kt
similarity index 90%
rename from gallery/gallery/android/app/src/main/kotlin/com/example/gallery/MainActivity.kt
rename to gallery/gallery/android/app/src/main/kotlin/io/flutter/demo/gallery/MainActivity.kt
index 5e77c2947..4f293f765 100644
--- a/gallery/gallery/android/app/src/main/kotlin/com/example/gallery/MainActivity.kt
+++ b/gallery/gallery/android/app/src/main/kotlin/io/flutter/demo/gallery/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.gallery
+package io.flutter.demo.gallery
 
 import android.os.Bundle
 
diff --git a/gallery/gallery/pubspec.yaml b/gallery/gallery/pubspec.yaml
index 0fd5ddb9b..2e05f70e7 100644
--- a/gallery/gallery/pubspec.yaml
+++ b/gallery/gallery/pubspec.yaml
@@ -1,7 +1,7 @@
 name: gallery
 description: A resource to help developers evaluate and use Flutter.
 
-version: 2.0.0
+version: 2.0.0+7
 
 environment:
   sdk: ">=2.3.0 <3.0.0"