diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-06-12 15:01:08 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-12 15:01:09 -0700 |
| commit | a3d5385c0e2138b8e215196bdb3734a44b55d31d (patch) | |
| tree | 7b7105703eb0c1547b042bcc31fca57c305f3153 /eclipse | |
| parent | 14e8d5a0bf200ea980e06d524fa0b6843eac863f (diff) | |
| parent | 752526df0fc98bade0f7aac3a1836d5a056c0913 (diff) | |
| download | sdk-a3d5385c0e2138b8e215196bdb3734a44b55d31d.zip sdk-a3d5385c0e2138b8e215196bdb3734a44b55d31d.tar.gz sdk-a3d5385c0e2138b8e215196bdb3734a44b55d31d.tar.bz2 | |
Merge "Fix bug in theme menu: don't strip style prefix from manifest"
Diffstat (limited to 'eclipse')
2 files changed, 4 insertions, 1 deletions
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 { |