diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-08 09:55:24 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-10-08 09:55:59 -0700 |
| commit | e03b81294f046474cf4057bec20dc560a2e053d4 (patch) | |
| tree | 21d30737612be69a262b4136e27d15745b00f3b3 /src/com | |
| parent | b50cc8c5d6125715b139d978887830a5341971aa (diff) | |
| download | android_packages_apps_Trebuchet-e03b81294f046474cf4057bec20dc560a2e053d4.tar.gz android_packages_apps_Trebuchet-e03b81294f046474cf4057bec20dc560a2e053d4.tar.bz2 android_packages_apps_Trebuchet-e03b81294f046474cf4057bec20dc560a2e053d4.zip | |
Using DeviceDefault theme for Launcher and WallpaperPicker
Change-Id: I31bfeedd99d50683fba910f233b25bb3f364ce1f
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherClings.java | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index aa403db01..24e2d6a0b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -73,7 +73,6 @@ import android.text.TextUtils; import android.text.method.TextKeyListener; import android.util.DisplayMetrics; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; import android.view.HapticFeedbackConstants; @@ -88,13 +87,11 @@ import android.view.View.OnLongClickListener; import android.view.ViewAnimationUtils; import android.view.ViewGroup; import android.view.ViewTreeObserver; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.Window; import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; -import android.view.animation.Interpolator; import android.view.inputmethod.InputMethodManager; import android.widget.Advanceable; import android.widget.FrameLayout; @@ -2564,7 +2561,7 @@ public class Launcher extends Activity private void showBrokenAppInstallDialog(final String packageName, DialogInterface.OnClickListener onSearchClickListener) { - new AlertDialog.Builder(new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault)) + new AlertDialog.Builder(this) .setTitle(R.string.abandoned_promises_title) .setMessage(R.string.abandoned_promise_explanation) .setPositiveButton(R.string.abandoned_search, onSearchClickListener) diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java index 458d81f61..ef8e8abcf 100644 --- a/src/com/android/launcher3/LauncherClings.java +++ b/src/com/android/launcher3/LauncherClings.java @@ -27,7 +27,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserManager; import android.provider.Settings; -import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -56,8 +55,7 @@ class LauncherClings implements OnClickListener { /** Ctor */ public LauncherClings(Launcher launcher) { mLauncher = launcher; - mInflater = LayoutInflater.from(new - ContextThemeWrapper(mLauncher, android.R.style.Theme_DeviceDefault)); + mInflater = LayoutInflater.from(mLauncher); } @Override |