am 672cb703: Merge "Changes for Beam memory" into lmp-dev

* commit '672cb7036e219e260ba97f025c70e59728e261d6':
  Changes for Beam memory

2 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/nfc/NfcApplication.java b/src/com/android/nfc/NfcApplication.java
index af72e084..33b5cab0 100644
--- a/src/com/android/nfc/NfcApplication.java
+++ b/src/com/android/nfc/NfcApplication.java
@@ -21,6 +21,8 @@ import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Application;
 import android.os.Process;
 import android.os.UserHandle;
+import android.view.HardwareRenderer;
+
 import java.util.Iterator;
 import java.util.List;
 
@@ -57,6 +59,7 @@ public class NfcApplication extends Application {
         }
         if (UserHandle.myUserId() == 0 && isMainProcess) {
             mNfcService = new NfcService(this);
+            HardwareRenderer.enableForegroundTrimming();
         }
     }
 }
diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java
index dec529c4..60ccb3fe 100644
--- a/src/com/android/nfc/SendUi.java
+++ b/src/com/android/nfc/SendUi.java
@@ -583,12 +583,11 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener,
     Bitmap createScreenshot() {
         // We need to orient the screenshot correctly (and the Surface api seems to
         // take screenshots only in the natural orientation of the device :!)
-
         mDisplay.getRealMetrics(mDisplayMetrics);
         boolean hasNavBar =  mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_showNavigationBar);
 
-        float[] dims = {mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels};
+        float[] dims = {mDisplayMetrics.widthPixels / 4, mDisplayMetrics.heightPixels / 4};
         float degrees = getDegreesForRotation(mDisplay.getRotation());
         final int statusBarHeight = mContext.getResources().getDimensionPixelSize(
                                         com.android.internal.R.dimen.status_bar_height);