summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-05-23 00:49:48 -0400
committerDaniel Sandler <dsandler@android.com>2012-05-23 01:38:26 -0400
commitaa0a3b692337ec8b6431e8d046ea01f042157334 (patch)
treed3cf78381880e3e2d5d36ea3dabdc95513966d9c /core/java/com
parented82973e616b1cbcab873dfb9c0191e63b34c821 (diff)
downloadframeworks_base-aa0a3b692337ec8b6431e8d046ea01f042157334.zip
frameworks_base-aa0a3b692337ec8b6431e8d046ea01f042157334.tar.gz
frameworks_base-aa0a3b692337ec8b6431e8d046ea01f042157334.tar.bz2
Stop animating when not showing.
We were eating too many jelly beans even when the screen was off. Also clean up touch offsets, rotation on fling, and main platlogo asset. Bug: 6541052 Change-Id: I34e49b8b7a95ce6daab929885130426a5ae58dc4
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/PlatLogoActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java
index e9db9d9..3a2b647 100644
--- a/core/java/com/android/internal/app/PlatLogoActivity.java
+++ b/core/java/com/android/internal/app/PlatLogoActivity.java
@@ -92,7 +92,7 @@ public class PlatLogoActivity extends Activity {
getWindowManager().getDefaultDisplay().getMetrics(metrics);
mContent = new ImageView(this);
- mContent.setImageResource(com.android.internal.R.drawable.platlogo);
+ mContent.setImageResource(com.android.internal.R.drawable.platlogo_alt);
mContent.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
final int p = (int)(32 * metrics.density);
@@ -102,7 +102,7 @@ public class PlatLogoActivity extends Activity {
@Override
public void onClick(View v) {
mToast.show();
- mContent.setImageResource(com.android.internal.R.drawable.platlogo_alt);
+ mContent.setImageResource(com.android.internal.R.drawable.platlogo);
}
});