am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs

Browse Source

* commit 'b31d0b3b6d0506970adeecd9177e276dd407f418':
  re-write the Dialog guide to focus on using DialogFragment

...

This commit is contained in:

Scott Main

2012-10-03 16:17:13 -07:00

committed by Android Git Automerger

parent 21dec9f96e b31d0b3b6d

commit d4c18b01cc

13 changed files with 762 additions and 636 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1398

docs/html/guide/topics/ui/dialogs.jd

File diff suppressed because it is too large Load Diff

BIN

docs/html/images/dialog_buttons.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.6 KiB

BIN

docs/html/images/dialog_custom.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.9 KiB

BIN

docs/html/images/dialog_list.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.7 KiB

BIN

docs/html/images/dialog_progress_bar.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

BIN

docs/html/images/dialog_progress_spinning.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.6 KiB

BIN

docs/html/images/dialog_singlechoicelist.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.0 KiB

BIN

docs/html/images/ui/dialog_buttons.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.3 KiB

BIN

docs/html/images/ui/dialog_checkboxes.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 33 KiB

BIN

docs/html/images/ui/dialog_custom.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 21 KiB

BIN

docs/html/images/ui/dialog_list.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

docs/html/images/ui/dialogs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 35 KiB

BIN

docs/html/images/ui/dialogs_regions.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB