From 752526df0fc98bade0f7aac3a1836d5a056c0913 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Mon, 11 Jun 2012 18:23:43 -0700 Subject: Fix bug in theme menu: don't strip style prefix from manifest Change-Id: I32c1f47b7e6e7c1d91d7e3000075046d2c872ad9 --- .../adt/internal/editors/layout/configuration/SelectThemeAction.java | 4 ++++ .../adt/internal/editors/layout/configuration/ThemeMenuAction.java | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'eclipse') diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java index b8ba48e..8d92d3c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java @@ -16,6 +16,9 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration; +import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE; +import static com.android.ide.common.resources.ResourceResolver.PREFIX_STYLE; + import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -30,6 +33,7 @@ class SelectThemeAction extends Action { public SelectThemeAction(ConfigurationComposite configuration, String title, String theme, boolean selected) { super(title, IAction.AS_RADIO_BUTTON); + assert theme.startsWith(PREFIX_STYLE) || theme.startsWith(PREFIX_ANDROID_STYLE) : theme; mConfiguration = configuration; mTheme = theme; if (selected) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java index 7e7d65b..0836709 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java @@ -199,7 +199,6 @@ class ThemeMenuAction extends SubmenuAction { String current = mConfiguration.getSelectedTheme(); for (String theme : sorted) { boolean selected = theme.equals(current); - theme = ResourceHelper.styleToTheme(theme); addMenuItem(menu, theme, selected); } } else { -- cgit v1.1