diff options
| author | Tor Norbye <tnorbye@google.com> | 2011-01-29 09:16:20 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-01-29 09:16:20 -0800 |
| commit | 88e063336c69eb346b7d1505ea05b07dff8781ce (patch) | |
| tree | e728c85443dc1feca5a110bf4c96e3e3d33dc26a /eclipse | |
| parent | 42564fd81c33f560b469eb28dec587b6adddf298 (diff) | |
| parent | a826ae01c155f162a6fc6ac2449a222c30e802b2 (diff) | |
| download | sdk-88e063336c69eb346b7d1505ea05b07dff8781ce.zip sdk-88e063336c69eb346b7d1505ea05b07dff8781ce.tar.gz sdk-88e063336c69eb346b7d1505ea05b07dff8781ce.tar.bz2 | |
Merge "Deemphasize AbsoluteLayout"
Diffstat (limited to 'eclipse')
2 files changed, 11 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java index 2fa20ea..4af4559 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java @@ -30,6 +30,8 @@ import com.android.ide.common.api.Point; import com.android.ide.common.api.Rect; import com.android.util.Pair; +import java.util.ArrayList; +import java.util.List; import java.util.Map; /** @@ -38,6 +40,14 @@ import java.util.Map; */ public class AbsoluteLayoutRule extends BaseLayoutRule { + @Override + public List<String> getSelectionHint(INode parentNode, INode childNode) { + List<String> infos = new ArrayList<String>(2); + infos.add("AbsoluteLayout is deprecated."); + infos.add("Use other layouts instead."); + return infos; + } + // ==== Drag'n'drop support ==== // The AbsoluteLayout accepts any drag'n'drop anywhere on its surface. diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/extra-view-metadata.xml b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/extra-view-metadata.xml index 9fa235b..627c2e9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/extra-view-metadata.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/extra-view-metadata.xml @@ -47,7 +47,6 @@ <view class="android.widget.LinearLayout" fill="opposite" render="skip"/> <view class="android.widget.RelativeLayout" fill="opposite" render="skip"/> <view class="android.widget.FrameLayout" fill="opposite" render="skip"/> - <view class="android.widget.AbsoluteLayout" fill="opposite" render="skip"/> <view class="android.widget.TableLayout" fill="opposite" render="skip"/> <view class="android.widget.TableRow" fill="opposite" render="skip"/> </category> @@ -99,6 +98,7 @@ <view class="include" skip="true" render="skip"/> <view class="merge" skip="true" render="skip"/> <view class="android.widget.DialerFilter" fill="width_in_vertical" render="skip"/> + <view class="android.widget.AbsoluteLayout" fill="opposite" render="skip"/> </category> <category name="Other"> <!-- This is the catch-all category which contains unknown views if we encounter any --> |