From 76c621480c724d2f025b0e93c02612889112fce4 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sat, 11 Feb 2017 16:18:14 +0800 Subject: [PATCH] Revert "You are now a developer!" We no longer have an alternative drawable. This reverts commit 2059ea69085224408d5355c98338f5243ac82ff3. Change-Id: I4ea4e81ae7c8b583fa107a0f32c3642f567bfb2d --- .../dexopt_brand_logo_alternative.xml | 60 ------------------- cm/res/res/layout/dexopt_dialog.xml | 1 - cm/res/res/values/symbols.xml | 2 - .../internal/BootDexoptDialog.java | 18 +----- 4 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 cm/res/res/drawable/dexopt_brand_logo_alternative.xml diff --git a/cm/res/res/drawable/dexopt_brand_logo_alternative.xml b/cm/res/res/drawable/dexopt_brand_logo_alternative.xml deleted file mode 100644 index 3c0f748..0000000 --- a/cm/res/res/drawable/dexopt_brand_logo_alternative.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - diff --git a/cm/res/res/layout/dexopt_dialog.xml b/cm/res/res/layout/dexopt_dialog.xml index 0b13f9e..a8707ca 100644 --- a/cm/res/res/layout/dexopt_dialog.xml +++ b/cm/res/res/layout/dexopt_dialog.xml @@ -29,7 +29,6 @@ android:elevation="8dp"> - @@ -141,7 +140,6 @@ - diff --git a/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java b/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java index b0c9d74..89dd676 100644 --- a/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java +++ b/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java @@ -18,13 +18,11 @@ package org.cyanogenmod.internal; import android.app.Dialog; import android.app.IActivityManager; -import android.content.ContentResolver; import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.provider.Settings; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -54,14 +52,7 @@ public class BootDexoptDialog extends Dialog { public static BootDexoptDialog create(Context context, int windowType) { final PackageManager pm = context.getPackageManager(); - final int brandLogo; final int theme; - if (Settings.Global.getInt(context.getContentResolver(), - Settings.Global.DEVELOPMENT_SETTINGS_ENABLED , 0) == 1) { - brandLogo = R.drawable.dexopt_brand_logo_alternative; - } else { - brandLogo = R.drawable.dexopt_brand_logo; - } if (pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION) || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { theme = com.android.internal.R.style.Theme_Micro_Dialog_Alert; @@ -71,11 +62,10 @@ public class BootDexoptDialog extends Dialog { theme = com.android.internal.R.style.Theme_Material_Light; } - return new BootDexoptDialog(context, theme, windowType, brandLogo); + return new BootDexoptDialog(context, theme, windowType); } - private BootDexoptDialog(Context context, int themeResId, int windowType, - int brandLogoResId) { + private BootDexoptDialog(Context context, int themeResId, int windowType) { super(context, themeResId); mHideAppDetails = context.getResources().getBoolean( R.bool.config_bootDexoptHideAppDetails); @@ -86,10 +76,6 @@ public class BootDexoptDialog extends Dialog { } setContentView(R.layout.dexopt_dialog); - - final ImageView brandLogo = (ImageView) findViewById(R.id.dexopt_logo_view); - brandLogo.setImageResource(brandLogoResId); - mMessage = (TextView) findViewById(R.id.dexopt_message); mDetailMsg = (TextView) findViewById(R.id.dexopt_message_detail); mAppIcon = (ImageView) findViewById(R.id.dexopt_icon);