diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-10-16 16:27:12 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-10-16 16:27:12 -0700 |
| commit | 8a8e094ee51f43fa297c25a240642e604ae03db5 (patch) | |
| tree | 74efe542a407daff8823ae3640eb5cd72567ccbd /eclipse/plugins | |
| parent | ae792f5be57d094bfa24adb1ff63a4c7c7efd59b (diff) | |
| download | sdk-8a8e094ee51f43fa297c25a240642e604ae03db5.zip sdk-8a8e094ee51f43fa297c25a240642e604ae03db5.tar.gz sdk-8a8e094ee51f43fa297c25a240642e604ae03db5.tar.bz2 | |
Fix a couple of bugs related to multiconfig switching
Change-Id: I0b441971de02fc4fc3da78e4e411828ca3eedbbc
Diffstat (limited to 'eclipse/plugins')
3 files changed, 7 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ComplementingConfiguration.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ComplementingConfiguration.java index d42c3f6..151301a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ComplementingConfiguration.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ComplementingConfiguration.java @@ -102,6 +102,9 @@ public class ComplementingConfiguration extends NestedConfiguration { @NonNull Configuration parent) { ComplementingConfiguration configuration = new ComplementingConfiguration(other.mConfigChooser, parent); + configuration.setDisplayName(other.getDisplayName()); + configuration.setActivity(other.getActivity()); + configuration.mUpdateDisplayName = other.mUpdateDisplayName; configuration.mOverrideLocale = other.mOverrideLocale; configuration.mOverrideTarget = other.mOverrideTarget; configuration.mOverrideDevice = other.mOverrideDevice; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/Configuration.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/Configuration.java index 1615722..3476964 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/Configuration.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/Configuration.java @@ -197,6 +197,7 @@ public class Configuration { copy.mLocale = original.getLocale(); copy.mUiMode = original.getUiMode(); copy.mNightMode = original.getNightMode(); + copy.mDisplayName = original.getDisplayName(); return copy; } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/NestedConfiguration.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/NestedConfiguration.java index 432abdb..7c2559c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/NestedConfiguration.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/NestedConfiguration.java @@ -83,6 +83,9 @@ public class NestedConfiguration extends Configuration { @NonNull Configuration parent) { NestedConfiguration configuration = new NestedConfiguration(other.mConfigChooser, parent); + configuration.setDisplayName(values.getDisplayName()); + configuration.setActivity(values.getActivity()); + configuration.mOverrideLocale = other.mOverrideLocale; if (configuration.mOverrideLocale) { configuration.setLocale(values.getLocale(), true); |