From 9395d02b1769419fd875143ced9ec7ae823b4c97 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Thu, 29 Dec 2016 18:21:23 +0800 Subject: Revert "Add CM PlatLogo (1/2)" As part of the rebrand to LineageOS. This reverts commit aed50cbe3c3dbe175dac695764df586d8dda14c9. Change-Id: I7ee6125f6c8d4ec8e57e5a1673bf2e095a11cb76 --- .../com/android/internal/app/PlatLogoActivity.java | 9 +- core/res/res/drawable-nodpi/platlogo_cm.xml | 55 ----------- core/res/res/values/cm_symbols.xml | 3 - packages/SystemUI/res/drawable/cid.xml | 33 ------- packages/SystemUI/res/layout/cmland.xml | 104 --------------------- .../src/com/android/systemui/egg/CMLand.java | 43 --------- .../src/com/android/systemui/egg/MLand.java | 13 +-- .../com/android/systemui/egg/MLandActivity.java | 10 +- 8 files changed, 4 insertions(+), 266 deletions(-) delete mode 100644 core/res/res/drawable-nodpi/platlogo_cm.xml delete mode 100644 packages/SystemUI/res/drawable/cid.xml delete mode 100644 packages/SystemUI/res/layout/cmland.xml delete mode 100644 packages/SystemUI/src/com/android/systemui/egg/CMLand.java 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); diff --git a/core/res/res/drawable-nodpi/platlogo_cm.xml b/core/res/res/drawable-nodpi/platlogo_cm.xml deleted file mode 100644 index b863c27..0000000 --- a/core/res/res/drawable-nodpi/platlogo_cm.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index a56e5ac..19a4672 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -101,9 +101,6 @@ - - - diff --git a/packages/SystemUI/res/drawable/cid.xml b/packages/SystemUI/res/drawable/cid.xml deleted file mode 100644 index 614a050..0000000 --- a/packages/SystemUI/res/drawable/cid.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/packages/SystemUI/res/layout/cmland.xml b/packages/SystemUI/res/layout/cmland.xml deleted file mode 100644 index 3c4e561..0000000 --- a/packages/SystemUI/res/layout/cmland.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/packages/SystemUI/src/com/android/systemui/egg/CMLand.java b/packages/SystemUI/src/com/android/systemui/egg/CMLand.java deleted file mode 100644 index 6020b45..0000000 --- a/packages/SystemUI/src/com/android/systemui/egg/CMLand.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.egg; - -import com.android.systemui.R; - -import android.content.Context; -import android.util.AttributeSet; - -public class CMLand extends MLand { - public static final String TAG = "CMLand"; - - public CMLand(Context context) { - this(context, null); - } - - public CMLand(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public CMLand(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - @Override - protected int getEggPlayer() { - return R.drawable.cid; - } -} diff --git a/packages/SystemUI/src/com/android/systemui/egg/MLand.java b/packages/SystemUI/src/com/android/systemui/egg/MLand.java index 1b22e04..b84777b 100644 --- a/packages/SystemUI/src/com/android/systemui/egg/MLand.java +++ b/packages/SystemUI/src/com/android/systemui/egg/MLand.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2015 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. @@ -211,8 +210,6 @@ public class MLand extends FrameLayout { // we assume everything will be laid out left|top setLayoutDirection(LAYOUT_DIRECTION_LTR); - Player.eggPlayer = getEggPlayer(); - setupPlayers(DEFAULT_PLAYERS); MetricsLogger.count(getContext(), "egg_mland_create", 1); @@ -1010,7 +1007,7 @@ public class MLand extends FrameLayout { public void step(long t_ms, long dt_ms, float t, float dt); } - protected static class Player extends ImageView implements GameView { + private static class Player extends ImageView implements GameView { public float dv; public int color; private MLand mLand; @@ -1020,8 +1017,6 @@ public class MLand extends FrameLayout { private int mScore; private TextView mScoreField; - protected static int eggPlayer; - private final int[] sColors = new int[] { //0xFF78C557, 0xFFDB4437, @@ -1093,7 +1088,7 @@ public class MLand extends FrameLayout { public Player(Context context) { super(context); - setBackgroundResource(eggPlayer); + setBackgroundResource(R.drawable.android); getBackground().setTintMode(PorterDuff.Mode.SRC_ATOP); color = sColors[(sNextColor++%sColors.length)]; getBackground().setTint(color); @@ -1443,8 +1438,4 @@ public class MLand extends FrameLayout { v = z = 0; } } - - protected int getEggPlayer() { - return R.drawable.android; - } } diff --git a/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java b/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java index 6fd7387..cdda45f 100644 --- a/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java +++ b/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2015 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. @@ -30,14 +29,7 @@ public class MLandActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - final boolean isCM = getIntent().getBooleanExtra("is_cm", false); - if (isCM) { - setContentView(R.layout.cmland); - mLand = (CMLand) findViewById(R.id.world); - } else { - setContentView(R.layout.mland); - mLand = (MLand) findViewById(R.id.world); - } + setContentView(R.layout.mland); mLand = (MLand) findViewById(R.id.world); mLand.setScoreFieldHolder((ViewGroup) findViewById(R.id.scores)); final View welcome = findViewById(R.id.welcome); -- cgit v1.1