Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0

4 files changed, 5 insertions, 65 deletions

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);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 4371cce..857cb08 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -90,7 +90,7 @@ public class StatusBarIconView extends AnimatedImageView {
     public void setNotification(Notification notification) {
         mNotification = notification;
         mShowNotificationCount = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.STATUS_BAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1;
+                CMSettings.System.STATUS_BAR_NOTIF_COUNT, 1, UserHandle.USER_CURRENT) == 1;
         setContentDescription(notification);
     }
 
@@ -388,7 +388,7 @@ public class StatusBarIconView extends AnimatedImageView {
         @Override
         public void update() {
             boolean showIconCount = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                    CMSettings.System.STATUS_BAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1;
+                    CMSettings.System.STATUS_BAR_NOTIF_COUNT, 1, UserHandle.USER_CURRENT) == 1;
             for (StatusBarIconView sbiv : mIconViews) {
                 sbiv.mShowNotificationCount = showIconCount;
                 sbiv.set(sbiv.mIcon, true);