commit 39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b
author Alan Newberger <alann@google.com> Wed Apr 30 23:16:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 30 23:16:37 2014 +0000
tree 750a83bb05d6e5077c593092617e70d38692276d
parent efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f
parent e95aefe4461e8e3192e227d98076b75975ed3ec5

Merge "Fix storage warning hint crash" into gb-ub-photos-denali

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index bd27f75..1cbe904 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1823,8 +1823,9 @@
         }
 
         if (message != null) {
+            Log.w(TAG, "Storage warning: " + message);
             if (mStorageHint == null) {
-                mStorageHint = OnScreenHint.makeText(mAppContext, message);
+                mStorageHint = OnScreenHint.makeText(CameraActivity.this, message);
             } else {
                 mStorageHint.setText(message);
             }
@@ -1832,7 +1833,7 @@
         } else if (mStorageHint != null) {
             mStorageHint.cancel();
             mStorageHint = null;
-        }
+       }
     }
 
     protected void setResultEx(int resultCode) {

src/com/android/camera/OnScreenHint.java

diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java
index b6bb71f..edc877b 100644
--- a/src/com/android/camera/OnScreenHint.java
+++ b/src/com/android/camera/OnScreenHint.java
@@ -16,6 +16,7 @@
 
 package com.android.camera;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.PixelFormat;
 import android.os.Handler;
@@ -62,9 +63,9 @@
      *                 {@link android.app.Application} or
      *                 {@link android.app.Activity} object.
      */
-    private OnScreenHint(Context context) {
-        mWM = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        mY = context.getResources().getDimensionPixelSize(
+    private OnScreenHint(Activity activity) {
+        mWM = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);
+        mY = activity.getResources().getDimensionPixelSize(
                 R.dimen.hint_y_offset);
 
         mParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
@@ -103,11 +104,11 @@
      * @param text     The text to show.  Can be formatted text.
      *
      */
-    public static OnScreenHint makeText(Context context, CharSequence text) {
-        OnScreenHint result = new OnScreenHint(context);
+    public static OnScreenHint makeText(Activity activity, CharSequence text) {
+        OnScreenHint result = new OnScreenHint(activity);
 
         LayoutInflater inflate =
-                (LayoutInflater) context.getSystemService(
+                (LayoutInflater) activity.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         View v = inflate.inflate(R.layout.on_screen_hint, null);
         TextView tv = (TextView) v.findViewById(R.id.message);
@@ -188,4 +189,3 @@
         }
     };
 }
-