use activity context for FirstRunDialog

orientation of ApplicationContext always returns its orientation as
landscape in clamshell mode. While it is the root cause of this issue,
IIUC, we don't need to use application context for FirstRunDialog.

Bug: 37214882, 62414856
Test: manually tested as described in the issue

Change-Id: I478d1f53d1d6dec74f98d59c80085d163f09c551
(cherry picked from commit 457620629c641e95cb9621fc804f23e82c60c8b4)

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 57384db..3eceb8f 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1655,7 +1655,7 @@ public class CameraActivity extends QuickActivity
         mMotionManager = getServices().getMotionManager();
 
         mFirstRunDialog = new FirstRunDialog(this,
-              getAndroidContext(),
+              this /* as context */,
               mResolutionSetting,
               mSettingsManager,
               mOneCameraManager,
@@ -2189,6 +2189,9 @@ public class CameraActivity extends QuickActivity
         if (mSoundPlayer != null) {
           mSoundPlayer.release();
         }
+        if (mFirstRunDialog != null) {
+            mFirstRunDialog.dismiss();
+        }
         CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
         CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO);
     }

diff --git a/src/com/android/camera/app/FirstRunDialog.java b/src/com/android/camera/app/FirstRunDialog.java
index d810c4b..91c0570 100644 (file)
--- a/src/com/android/camera/app/FirstRunDialog.java
+++ b/src/com/android/camera/app/FirstRunDialog.java
@@ -60,7 +60,7 @@ public class FirstRunDialog {
     /** The hardware manager. */
     private final OneCameraManager mOneCameraManager;
 
-    /** The app context. */
+    /** The activity context. */
     private final Context mContext;
 
     /** The resolution settings. */
@@ -81,13 +81,13 @@ public class FirstRunDialog {
      */
     public FirstRunDialog(
           AppController appController,
-          Context androidContext,
+          Context activityContext,
           ResolutionSetting resolutionSetting,
           SettingsManager settingManager,
           OneCameraManager hardwareManager,
           FirstRunDialogListener listener) {
         mAppController = appController;
-        mContext = androidContext;
+        mContext = activityContext;
         mResolutionSetting = resolutionSetting;
         mSettingsManager = settingManager;
         mOneCameraManager = hardwareManager;