Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eec841f0 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8560 into donut 

* changes:
  Merge doc changes from cupcake: commit '5ae517d9' into manualmerge
parents b4fc70fc 2bfd344b

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		$(web_docs_sample_code_flags) \

		-toroot / \

		-hdf android.whichdoc online

		-hdf android.whichdoc online \

		-hdf template.showLanguageMenu true



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk

LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

docs/html/guide/guide_toc.cs

+370 −139

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/images/menu_design/ContextMenuDiagram.png

0 → 100644
+77.9 KiB
Loading image diff...

docs/html/images/menu_design/ContextMenuViewContactDiagram.png

0 → 100644
+83.6 KiB
Loading image diff...

docs/html/images/menu_design/MenuDiagram.png

0 → 100644
+152 KiB
Loading image diff...