Revert "You are now a developer!"

We no longer have an alternative drawable.

This reverts commit 2059ea6908.

Change-Id: I4ea4e81ae7c8b583fa107a0f32c3642f567bfb2d

cm/res/res/drawable/dexopt_brand_logo_alternative.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 The CyanogenMod Project
-    Copyright (c) 2017 The LineageOS 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="96dp"
-    android:height="90dp"
-    android:viewportWidth="96"
-    android:viewportHeight="90">
-
-    <path
-        android:fillColor="@color/dexopt_logo"
-        android:pathData="M86.416,36.173c-2.901-0.002-5.647,1.311-7.468,3.569l-0.36-0.144c-3.69-1.447-7.496-2.582-11.376-3.392
-c0,0,0-0.022,0-0.034c0-10.606-8.598-19.204-19.204-19.204s-19.204,8.598-19.204,19.204c0,0,0,0.022,0,0.031l-0.413,0.091
-c-3.738,0.802-7.404,1.906-10.963,3.303l-0.36,0.144c-3.334-4.124-9.38-4.764-13.504-1.43c-4.124,3.334-4.764,9.38-1.43,13.504
-c3.334,4.124,9.38,4.764,13.504,1.43c2.987-2.415,4.247-6.379,3.204-10.076l0,0c3.358-1.319,6.818-2.362,10.346-3.121
-c2.133,10.389,12.285,17.082,22.674,14.949c7.524-1.545,13.404-7.425,14.949-14.949c3.528,0.758,6.989,1.802,10.348,3.121l0,0
-c-1.438,5.104,1.533,10.408,6.637,11.846c5.104,1.438,10.408-1.533,11.846-6.637c1.438-5.104-1.533-10.408-6.637-11.846
-C88.163,36.295,87.292,36.174,86.416,36.173z
-M9.601,51.536c-3.182,0-5.761-2.579-5.761-5.761s2.579-5.761,5.761-5.761
-s5.761,2.579,5.761,5.761S12.783,51.536,9.601,51.536z
-M48.009,51.536c-8.485,0-15.363-6.878-15.363-15.363
-S39.524,20.81,48.009,20.81s15.363,6.878,15.363,15.363C63.362,44.653,56.489,51.526,48.009,51.536z
-M86.416,51.536
-c-3.182,0-5.761-2.579-5.761-5.761s2.579-5.761,5.761-5.761c3.182,0,5.761,2.579,5.761,5.761S89.598,51.536,86.416,51.536z
-M55.69,36.173c0,4.242-3.439,7.682-7.682,7.682s-7.682-3.439-7.682-7.682s3.439-7.682,7.682-7.682S55.69,31.93,55.69,36.173z
-M72.013,66.025h-2.569v1.32h2.312v0.943h-2.312v1.414h2.499v0.96h-3.622v-5.13c-0.005-0.125,0.047-0.246,0.142-0.329
-c0.092-0.083,0.212-0.128,0.336-0.125h3.214V66.025L72.013,66.025z
-M62.01,70.739c-0.747,0.041-1.477-0.238-2.007-0.766
-c-0.51-0.565-0.774-1.309-0.735-2.069c-0.04-0.788,0.242-1.558,0.78-2.134c0.55-0.54,1.299-0.827,2.069-0.792
-c0.504-0.014,1.002,0.11,1.44,0.36c0.379,0.219,0.683,0.548,0.871,0.943l-0.898,0.48c-0.27-0.546-0.751-0.819-1.44-0.819
-c-0.468-0.02-0.921,0.17-1.234,0.519c-0.325,0.398-0.489,0.903-0.461,1.416c-0.029,0.501,0.123,0.995,0.43,1.392
-c0.295,0.34,0.729,0.526,1.179,0.504c0.402,0.015,0.796-0.12,1.104-0.379c0.283-0.239,0.447-0.59,0.449-0.96h-1.414v-0.881h2.52
-v0.617c0.026,0.696-0.247,1.37-0.749,1.853C63.401,70.505,62.715,70.762,62.01,70.739z
-M55.301,70.653l-0.48-1.383h-2.038
-l-0.48,1.383h-1.164l1.889-5.161c0.109-0.296,0.361-0.444,0.756-0.444s0.651,0.151,0.766,0.454l1.889,5.151H55.301z
-M53.114,68.339 h1.397l-0.703-2.069L53.114,68.339z
-M48.225,66.025h-2.569v1.32h2.312v0.943h-2.312v1.414h2.496v0.96H44.53v-5.13
-c-0.005-0.125,0.047-0.246,0.142-0.329c0.092-0.083,0.212-0.128,0.336-0.125h3.217L48.225,66.025L48.225,66.025z
-M39.648,65.079
-h1.023v5.281c0,0.11-0.063,0.211-0.161,0.262c-0.122,0.069-0.261,0.103-0.401,0.098c-0.14,0.007-0.28-0.017-0.41-0.07
-c-0.108-0.057-0.2-0.139-0.269-0.24l-2.463-3.512v3.747h-1.037v-5.161c-0.009-0.133,0.053-0.261,0.163-0.336
-c0.129-0.079,0.279-0.117,0.43-0.11c0.158-0.011,0.316,0.021,0.456,0.094c0.134,0.104,0.249,0.23,0.338,0.374l2.333,3.262
-L39.648,65.079L39.648,65.079z M30.965,70.653v-5.574h1.123v5.574H30.965z
-M24.458,70.653c-0.242,0.008-0.446-0.182-0.454-0.424
-c0-0.01,0-0.02,0-0.029v-5.12h1.116v4.638h2.484v0.936H24.458z" />
-</vector>

cm/res/res/layout/dexopt_dialog.xml

@@ -29,7 +29,6 @@
         android:elevation="8dp">
 
         <ImageView
-            android:id="@+id/dexopt_logo_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/dexopt_bottom_height"

cm/res/res/values/symbols.xml

@@ -132,7 +132,6 @@
     <!-- Boot dexopt dialog -->
     <java-symbol type="bool" name="config_bootDexoptHideAppDetails" />
     <java-symbol type="drawable" name="dexopt_brand_logo" />
-    <java-symbol type="drawable" name="dexopt_brand_logo_alternative" />
     <java-symbol type="drawable" name="ic_device_bg" />
     <java-symbol type="drawable" name="ic_device" />
     <java-symbol type="drawable" name="ic_dexopt_obscured" />
@@ -141,7 +140,6 @@
     <java-symbol type="drawable" name="ic_droid" />
     <java-symbol type="layout" name="dexopt_dialog" />
     <java-symbol type="id" name="dexopt_icon" />
-    <java-symbol type="id" name="dexopt_logo_view" />
     <java-symbol type="id" name="dexopt_message" />
     <java-symbol type="id" name="dexopt_message_detail" />
     <java-symbol type="id" name="dexopt_progress" />

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,
+    private BootDexoptDialog(Context context, int themeResId, int windowType) {
-            int brandLogoResId) {
         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);