Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 79934c00: am 81de5a0b: Merge "Stop animating when not showing." into jb-dev

Browse Source 
* commit '79934c0048a6bfccdbb6dda0fc45db3240ba5de8':
  Stop animating when not showing.
This commit is contained in:
Daniel Sandler
2012-05-23 11:12:25 -07:00
committed by Android Git Automerger
parent 2b5d509584 79934c0048
commit 0fc034f49f
5 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/PlatLogoActivity.java
View File

@@ -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);
}
});