summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-05-27 18:04:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 18:04:36 +0000
commit5859fc1096274a00f388a8ffc11b8919e9cb8dae (patch)
tree24789a5aa8281bbb106f8bc18f7b4d1c75721990 /services
parent150c07993fddf7fcfd24849148f89aa1b4bb6e87 (diff)
parent2eb4f9c377c01b5644c00f4b0cca2e655e107998 (diff)
downloadframeworks_base-5859fc1096274a00f388a8ffc11b8919e9cb8dae.zip
frameworks_base-5859fc1096274a00f388a8ffc11b8919e9cb8dae.tar.gz
frameworks_base-5859fc1096274a00f388a8ffc11b8919e9cb8dae.tar.bz2
Merge "DO NOT MERGE" into lmp-preview-dev
Diffstat (limited to 'services')
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityStack.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index d96e5eb..a0440cb 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -349,10 +349,8 @@ final class ActivityStack {
mCurrentUser = mService.mCurrentUserId;
// Get the activity screenshot thumbnail dimensions
Resources res = mService.mContext.getResources();
- mThumbnailWidth =
- res.getDimensionPixelSize(com.android.internal.R.dimen.recents_thumbnail_width);
- mThumbnailHeight =
- res.getDimensionPixelSize(com.android.internal.R.dimen.recents_thumbnail_height);
+ mThumbnailWidth = res.getDimensionPixelSize(com.android.internal.R.dimen.thumbnail_width);
+ mThumbnailHeight = res.getDimensionPixelSize(com.android.internal.R.dimen.thumbnail_height);
}
/**