diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-11-13 21:22:46 +0200 |
---|---|---|
committer | AdrianDC <radian.dc@gmail.com> | 2015-12-05 10:33:55 +0100 |
commit | aed50cbe3c3dbe175dac695764df586d8dda14c9 (patch) | |
tree | c1c6f7cbabb3ce7784dd0e1a2b19025d9be9c8f9 /core/java/com/android/internal/app/PlatLogoActivity.java | |
parent | 0dc882ea06de7a322f62796883c45d5fd1f216f8 (diff) | |
download | frameworks_base-aed50cbe3c3dbe175dac695764df586d8dda14c9.zip frameworks_base-aed50cbe3c3dbe175dac695764df586d8dda14c9.tar.gz frameworks_base-aed50cbe3c3dbe175dac695764df586d8dda14c9.tar.bz2 |
Add CM PlatLogo (1/2)
* Icons by: Björn Lundén & Asher Simonds
Change-Id: Ie2b092bafd3588270177648003dafed8226cf298
Diffstat (limited to 'core/java/com/android/internal/app/PlatLogoActivity.java')
-rw-r--r-- | core/java/com/android/internal/app/PlatLogoActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index 2595fe0..efe88ff 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 The Android Open Source Project + * Copyright (C) 2014-2015 The CyanogenMod Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,10 +58,13 @@ public class PlatLogoActivity extends Activity { int mKeyCount; PathInterpolator mInterpolator = new PathInterpolator(0f, 0f, 0.5f, 1f); + private boolean mIsCM; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mIsCM = getIntent().hasExtra("is_cm"); mLayout = new FrameLayout(this); setContentView(mLayout); } @@ -153,6 +157,7 @@ public class PlatLogoActivity extends Activity { .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) + .putExtra("is_cm", mIsCM) .addCategory("com.android.internal.category.PLATLOGO")); } catch (ActivityNotFoundException ex) { Log.e("PlatLogoActivity", "No more eggs."); @@ -202,7 +207,9 @@ public class PlatLogoActivity extends Activity { } public void showMarshmallow(View im) { - final Drawable fg = getDrawable(com.android.internal.R.drawable.platlogo); + final Drawable fg = getDrawable(mIsCM + ? com.android.internal.R.drawable.platlogo_cm + : com.android.internal.R.drawable.platlogo); fg.setBounds(0, 0, im.getWidth(), im.getHeight()); fg.setAlpha(0); im.getOverlay().add(fg); |