diff options
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, 1 insertions, 8 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index efe88ff..2595fe0 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -1,6 +1,5 @@ /* * 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. @@ -58,13 +57,10 @@ 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); } @@ -157,7 +153,6 @@ 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."); @@ -207,9 +202,7 @@ public class PlatLogoActivity extends Activity { } public void showMarshmallow(View im) { - final Drawable fg = getDrawable(mIsCM - ? com.android.internal.R.drawable.platlogo_cm - : com.android.internal.R.drawable.platlogo); + final Drawable fg = getDrawable(com.android.internal.R.drawable.platlogo); fg.setBounds(0, 0, im.getWidth(), im.getHeight()); fg.setAlpha(0); im.getOverlay().add(fg); |