From 2059ea69085224408d5355c98338f5243ac82ff3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 18 Aug 2016 20:55:10 +0300 Subject: You are now a developer! * Show alternative brand logo in dexopt screen when developer options are enabled * Drawable by Asher Change-Id: Ie100d7c3e9c96a7ad64c4cd65195d6f531090140 --- .../res/drawable/dexopt_brand_logo_alternative.xml | 28 ++++++++++++++++++++++ cm/res/res/layout/dexopt_dialog.xml | 1 + cm/res/res/values/symbols.xml | 2 ++ .../org/cyanogenmod/internal/BootDexoptDialog.java | 18 ++++++++++++-- 4 files changed, 47 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 0000000..9326610 --- /dev/null +++ b/cm/res/res/drawable/dexopt_brand_logo_alternative.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/cm/res/res/layout/dexopt_dialog.xml b/cm/res/res/layout/dexopt_dialog.xml index a8707ca..0b13f9e 100644 --- a/cm/res/res/layout/dexopt_dialog.xml +++ b/cm/res/res/layout/dexopt_dialog.xml @@ -29,6 +29,7 @@ android:elevation="8dp"> + @@ -140,6 +141,7 @@ + diff --git a/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java b/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java index 89dd676..b0c9d74 100644 --- a/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java +++ b/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java @@ -18,11 +18,13 @@ 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; @@ -52,7 +54,14 @@ 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; @@ -62,10 +71,11 @@ public class BootDexoptDialog extends Dialog { theme = com.android.internal.R.style.Theme_Material_Light; } - return new BootDexoptDialog(context, theme, windowType); + return new BootDexoptDialog(context, theme, windowType, brandLogo); } - private BootDexoptDialog(Context context, int themeResId, int windowType) { + private BootDexoptDialog(Context context, int themeResId, int windowType, + int brandLogoResId) { super(context, themeResId); mHideAppDetails = context.getResources().getBoolean( R.bool.config_bootDexoptHideAppDetails); @@ -76,6 +86,10 @@ 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); -- cgit v1.1