diff --git a/api/cm_current.txt b/api/cm_current.txt index 5a57e676..a93f52fc 100644 --- a/api/cm_current.txt +++ b/api/cm_current.txt @@ -742,30 +742,14 @@ package cyanogenmod.platform { ctor public R.bool(); } - public static final class R.color { - ctor public R.color(); - } - - public static final class R.dimen { - ctor public R.dimen(); - } - public static final class R.drawable { ctor public R.drawable(); } - public static final class R.id { - ctor public R.id(); - } - public static final class R.integer { ctor public R.integer(); } - public static final class R.layout { - ctor public R.layout(); - } - public static final class R.string { ctor public R.string(); } diff --git a/cm/res/res/drawable/dexopt_brand_logo.xml b/cm/res/res/drawable/dexopt_brand_logo.xml deleted file mode 100644 index 07afe035..00000000 --- a/cm/res/res/drawable/dexopt_brand_logo.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - 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 93266101..00000000 --- a/cm/res/res/drawable/dexopt_brand_logo_alternative.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/cm/res/res/drawable/ic_device.xml b/cm/res/res/drawable/ic_device.xml deleted file mode 100644 index be88d71d..00000000 --- a/cm/res/res/drawable/ic_device.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/cm/res/res/drawable/ic_device_bg.xml b/cm/res/res/drawable/ic_device_bg.xml deleted file mode 100644 index 33369469..00000000 --- a/cm/res/res/drawable/ic_device_bg.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/cm/res/res/drawable/ic_dexopt_obscured.xml b/cm/res/res/drawable/ic_dexopt_obscured.xml deleted file mode 100644 index 14c5fefb..00000000 --- a/cm/res/res/drawable/ic_dexopt_obscured.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/cm/res/res/drawable/ic_dexopt_starting.xml b/cm/res/res/drawable/ic_dexopt_starting.xml deleted file mode 100644 index 09b4a3a5..00000000 --- a/cm/res/res/drawable/ic_dexopt_starting.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/cm/res/res/drawable/ic_droid.xml b/cm/res/res/drawable/ic_droid.xml deleted file mode 100644 index 9ce3a65b..00000000 --- a/cm/res/res/drawable/ic_droid.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - diff --git a/cm/res/res/drawable/ic_droid_bg.xml b/cm/res/res/drawable/ic_droid_bg.xml deleted file mode 100644 index 4c537faa..00000000 --- a/cm/res/res/drawable/ic_droid_bg.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/cm/res/res/layout/dexopt_dialog.xml b/cm/res/res/layout/dexopt_dialog.xml deleted file mode 100644 index 0b13f9ec..00000000 --- a/cm/res/res/layout/dexopt_dialog.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/cm/res/res/values/colors.xml b/cm/res/res/values/colors.xml deleted file mode 100644 index 7bf309f5..00000000 --- a/cm/res/res/values/colors.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - #ffffff - #000000 - #2baae2 - - - @color/black - #212121 - #deffffff - #8affffff - #212121 - @color/cm_cyan - #757575 - diff --git a/cm/res/res/values/config.xml b/cm/res/res/values/config.xml index 12521223..bae8ff9d 100644 --- a/cm/res/res/values/config.xml +++ b/cm/res/res/values/config.xml @@ -129,7 +129,4 @@ org.cyanogenmod.platform.internal.CMSystemServer - - - false diff --git a/cm/res/res/values/dimens.xml b/cm/res/res/values/dimens.xml deleted file mode 100644 index 4a0c2783..00000000 --- a/cm/res/res/values/dimens.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - 96dp - 24dp - 48dp - diff --git a/cm/res/res/values/strings.xml b/cm/res/res/values/strings.xml index 8e3c4e7f..19e5569b 100644 --- a/cm/res/res/values/strings.xml +++ b/cm/res/res/values/strings.xml @@ -226,13 +226,4 @@ Themes Customize your theme - - Starting apps\u2026 - Optimizing storage\u2026 - Preparing to start\u2026 - Optimization completed. - Preparing %1$s\u2026 - Preparing apps\u2026 - %1$d of %2$d apps - diff --git a/cm/res/res/values/symbols.xml b/cm/res/res/values/symbols.xml index 874b49de..7c19dc88 100644 --- a/cm/res/res/values/symbols.xml +++ b/cm/res/res/values/symbols.xml @@ -128,29 +128,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java b/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java deleted file mode 100644 index b0c9d740..00000000 --- a/sdk/src/java/org/cyanogenmod/internal/BootDexoptDialog.java +++ /dev/null @@ -1,187 +0,0 @@ -/* - * Copyright (C) 2016 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 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; -import android.view.Window; -import android.view.WindowManager; -import android.view.accessibility.AccessibilityEvent; -import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.TextView; - -import org.cyanogenmod.platform.internal.R; - -/** - * @hide - */ -public class BootDexoptDialog extends Dialog { - private final boolean mHideAppDetails; - - private final ImageView mAppIcon; - private final TextView mMessage; - private final TextView mDetailMsg; - private final ProgressBar mProgress; - - public static BootDexoptDialog create(Context context) { - return create(context, WindowManager.LayoutParams.TYPE_BOOT_PROGRESS); - } - - 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; - } else if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) { - theme = com.android.internal.R.style.Theme_Leanback_Dialog_Alert; - } else { - theme = com.android.internal.R.style.Theme_Material_Light; - } - - return new BootDexoptDialog(context, theme, windowType, brandLogo); - } - - private BootDexoptDialog(Context context, int themeResId, int windowType, - int brandLogoResId) { - super(context, themeResId); - mHideAppDetails = context.getResources().getBoolean( - R.bool.config_bootDexoptHideAppDetails); - - requestWindowFeature(Window.FEATURE_NO_TITLE); - if (windowType != 0) { - getWindow().setType(windowType); - } - - 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); - mProgress = (ProgressBar) findViewById(R.id.dexopt_progress); - - getWindow().setLayout( - WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN - | WindowManager.LayoutParams.FLAG_FULLSCREEN); - - final WindowManager.LayoutParams lp = getWindow().getAttributes(); - // turn off button lights when dexopting - lp.buttonBrightness = 0; - lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; - getWindow().setAttributes(lp); - setCancelable(false); - show(); - - // start the marquee - mMessage.setSelected(true); - mDetailMsg.setSelected(true); - } - - public void setProgress(final int stage, final ApplicationInfo optimizedApp, - final int currentAppPos, final int totalAppCount) { - if (totalAppCount > 0) { - mProgress.setMax(totalAppCount); - } - - final Resources res = getContext().getResources(); - final PackageManager pm = getContext().getPackageManager(); - - if (optimizedApp != null) { - if (mHideAppDetails) { - mMessage.setText(res.getString(R.string.android_preparing_apk_obscured)); - mAppIcon.setImageResource(R.drawable.ic_dexopt_obscured); - } else { - final CharSequence label = optimizedApp.loadLabel(pm); - mMessage.setText(res.getString(R.string.android_preparing_apk, label)); - mAppIcon.setImageDrawable(optimizedApp.loadIcon(pm)); - } - mDetailMsg.setText(res.getString( - R.string.android_upgrading_apk, currentAppPos, totalAppCount)); - mProgress.setProgress(currentAppPos); - mProgress.setVisibility(View.VISIBLE); - } else { - mMessage.setText(res.getString(R.string.android_upgrading_complete)); - mAppIcon.setImageResource(R.drawable.ic_dexopt_starting); - mProgress.setVisibility(View.INVISIBLE); - - if (stage == IActivityManager.BOOT_STAGE_STARTING_APPS) { - mDetailMsg.setText(res.getString(R.string.android_upgrading_starting_apps)); - } else if (stage == IActivityManager.BOOT_STAGE_FSTRIM) { - mDetailMsg.setText(res.getString(R.string.android_upgrading_fstrim)); - } else if (stage == IActivityManager.BOOT_STAGE_COMPLETE) { - mDetailMsg.setText(res.getString(R.string.android_upgrading_complete_details)); - } else { - mDetailMsg.setText(null); - } - } - } - - // This dialog will consume all events coming in to - // it, to avoid it trying to do things too early in boot. - - @Override - public boolean dispatchKeyEvent(KeyEvent event) { - return true; - } - - @Override - public boolean dispatchKeyShortcutEvent(KeyEvent event) { - return true; - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - return true; - } - - @Override - public boolean dispatchTrackballEvent(MotionEvent ev) { - return true; - } - - @Override - public boolean dispatchGenericMotionEvent(MotionEvent ev) { - return true; - } - - @Override - public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { - return true; - } -} diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt index 5a57e676..a93f52fc 100644 --- a/system-api/cm_system-current.txt +++ b/system-api/cm_system-current.txt @@ -742,30 +742,14 @@ package cyanogenmod.platform { ctor public R.bool(); } - public static final class R.color { - ctor public R.color(); - } - - public static final class R.dimen { - ctor public R.dimen(); - } - public static final class R.drawable { ctor public R.drawable(); } - public static final class R.id { - ctor public R.id(); - } - public static final class R.integer { ctor public R.integer(); } - public static final class R.layout { - ctor public R.layout(); - } - public static final class R.string { ctor public R.string(); }