Searched refs:merge (Results 1 – 6 of 6) sorted by relevance
| /sdk/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/ |
| D | completion9-expected-completion64.txt | 66 <merge ></merge> : A root tag useful for XML layouts inflated using a ViewStub.
|
| /sdk/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ |
| D | CanvasViewInfo.java | 697 UiViewElementNode merge = null; in create() local
712 if (merge != null && parent != merge) { in create()
715 merge = (UiViewElementNode) parent; in create()
731 merge, absRect, absRect, null /* viewInfo */); in create()
751 CanvasViewInfo merge = new CanvasViewInfo(null, VIEW_MERGE, null, in create() local
756 rootView.mParent = merge; in create()
757 merge.addChild(rootView); in create()
758 rootView = merge; in create()
|
| /sdk/ |
| D | README.txt | 100 - It generates a git merge msg in prebuilts/devtools that has the sha1
|
| /sdk/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/ |
| D | TemplateHandler.java | 629 merge(freemarker, paramMap, fromPath, to); in execute()
705 private void merge( in merge() method in TemplateHandler
|
| /sdk/templates/docs/ |
| D | jquery-1.8.0.min.js | 2 …merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.le…
|
| /sdk/eclipse/ |
| D | changes.txt | 166 and merge tags. This tended to pollute the namespace with a lot of
386 - Further improvements to <merge> layouts, as well as layouts with
398 - Improved support for rendering <include> and <merge> views
|