diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2012-11-29 12:45:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 12:45:26 -0800 |
| commit | bea4bb716e71a63d78bf757fe88c46e2d2da7a56 (patch) | |
| tree | 741d7170908fc0195c5e1e9eedeab9dd56aee178 | |
| parent | eceef837e34e6860ad532d15402435606550f3fa (diff) | |
| parent | a539807a7c50948eec99b27e2d4d05da208ae3f1 (diff) | |
| download | frameworks_base-bea4bb716e71a63d78bf757fe88c46e2d2da7a56.zip frameworks_base-bea4bb716e71a63d78bf757fe88c46e2d2da7a56.tar.gz frameworks_base-bea4bb716e71a63d78bf757fe88c46e2d2da7a56.tar.bz2 | |
am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
* commit 'a539807a7c50948eec99b27e2d4d05da208ae3f1':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
| -rw-r--r-- | docs/html/distribute/googleplay/promote/brand.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/images/4.0/folders.xcf | bin | 259819 -> 0 bytes | |||
| -rw-r--r-- | docs/html/shareables/README.txt (renamed from docs/html/shareables/README) | 0 | ||||
| -rw-r--r-- | docs/html/tools/sdk/images/4.0/folders.xcf | bin | 259819 -> 0 bytes | |||
| -rw-r--r-- | docs/image_sources/activity_lifecycle.graffle (renamed from docs/html/images/activity_lifecycle.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/brand/Android_Robot_outlined.ai (renamed from docs/html/images/brand/Android_Robot_outlined.ai) | 0 | ||||
| -rw-r--r-- | docs/image_sources/brand/Google_Play_Store.ai (renamed from docs/html/images/brand/Google_Play_Store.ai) | 0 | ||||
| -rw-r--r-- | docs/image_sources/brand/en_app_rgb_wo.ai (renamed from docs/html/images/brand/en_app_rgb_wo.ai) | 0 | ||||
| -rw-r--r-- | docs/image_sources/brand/en_generic_rgb_wo.ai (renamed from docs/html/images/brand/en_generic_rgb_wo.ai) | 0 | ||||
| -rw-r--r-- | docs/image_sources/fundamentals/fragments.graffle (renamed from docs/html/images/fundamentals/fragments.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/fundamentals/restore_instance.graffle (renamed from docs/html/images/fundamentals/restore_instance.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/fundamentals/service_lifecycle.graffle (renamed from docs/html/images/fundamentals/service_lifecycle.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/providers/datamodel.graffle (renamed from docs/html/images/providers/datamodel.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/resources/res-selection-flowchart.graffle (renamed from docs/html/images/resources/res-selection-flowchart.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/resources/resource_devices_diagram.graffle (renamed from docs/html/images/resources/resource_devices_diagram.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/rs_compute.graffle (renamed from docs/html/images/rs_compute.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/rs_graphics.graffle (renamed from docs/html/images/rs_graphics.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/rs_overview.graffle (renamed from docs/html/images/rs_overview.graffle) | 0 | ||||
| -rw-r--r-- | docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf (renamed from docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf) | bin | 49980 -> 49980 bytes | |||
| -rw-r--r-- | docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff (renamed from docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff) | bin | 8168 -> 8168 bytes | |||
| -rw-r--r-- | docs/image_sources/training/basics/basic-lifecycle.graffle/data.plist (renamed from docs/html/images/training/basics/basic-lifecycle.graffle/data.plist) | 0 | ||||
| -rw-r--r-- | docs/image_sources/training/basics/basic-lifecycle.graffle/image1.png (renamed from docs/html/images/training/basics/basic-lifecycle.graffle/image1.png) | bin | 16087 -> 16087 bytes | |||
| -rw-r--r-- | docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf (renamed from docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf) | bin | 25152 -> 25152 bytes | |||
| -rw-r--r-- | docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff (renamed from docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff) | bin | 5432 -> 5432 bytes | |||
| -rw-r--r-- | docs/image_sources/training/basics/basic-simple-screen-mock.graffle/data.plist (renamed from docs/html/images/training/basic-simple-screen-mock.graffle/data.plist) | 0 | ||||
| -rw-r--r-- | docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image1.png (renamed from docs/html/images/training/basic-simple-screen-mock.graffle/image1.png) | bin | 28173 -> 28173 bytes | |||
| -rw-r--r-- | docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image2.png (renamed from docs/html/images/training/basic-simple-screen-mock.graffle/image2.png) | bin | 12453 -> 12453 bytes | |||
| -rw-r--r-- | docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Preview.pdf (renamed from docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf) | bin | 52394 -> 52394 bytes | |||
| -rw-r--r-- | docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff (renamed from docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff) | bin | 9292 -> 9292 bytes | |||
| -rw-r--r-- | docs/image_sources/training/fragments-screen-mock.graffle/data.plist (renamed from docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist) | 0 | ||||
| -rw-r--r-- | docs/image_sources/training/fragments-screen-mock.graffle/image1.png (renamed from docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png) | bin | 28173 -> 28173 bytes | |||
| -rw-r--r-- | docs/image_sources/training/fragments-screen-mock.graffle/image2.png (renamed from docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png) | bin | 12453 -> 12453 bytes | |||
| -rw-r--r-- | docs/image_sources/ui/actionbar-navigate-up.xcf (renamed from docs/html/images/ui/actionbar-navigate-up.xcf) | bin | 262000 -> 262000 bytes |
33 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd index cb6bf48..834f8a9 100644 --- a/docs/html/distribute/googleplay/promote/brand.jd +++ b/docs/html/distribute/googleplay/promote/brand.jd @@ -51,7 +51,7 @@ Instead use "for Android." <p style="text-align:center"> <a href="{@docRoot}images/brand/Android_Robot_100.png">100x118</a> | <a href="{@docRoot}images/brand/Android_Robot_200.png">200x237</a><br> - <a href="{@docRoot}images/brand/Android_Robot_outlined.ai">Illustrator (.ai)</a></p> + <a href="{@docRoot}downloads/brand/Android_Robot_outlined.ai">Illustrator (.ai)</a></p> </div> <p>The Android robot can be used, reproduced, and modified freely in marketing diff --git a/docs/html/sdk/images/4.0/folders.xcf b/docs/html/sdk/images/4.0/folders.xcf Binary files differdeleted file mode 100644 index 66cc02c..0000000 --- a/docs/html/sdk/images/4.0/folders.xcf +++ /dev/null diff --git a/docs/html/shareables/README b/docs/html/shareables/README.txt index 241618e..241618e 100644 --- a/docs/html/shareables/README +++ b/docs/html/shareables/README.txt diff --git a/docs/html/tools/sdk/images/4.0/folders.xcf b/docs/html/tools/sdk/images/4.0/folders.xcf Binary files differdeleted file mode 100644 index 66cc02c..0000000 --- a/docs/html/tools/sdk/images/4.0/folders.xcf +++ /dev/null diff --git a/docs/html/images/activity_lifecycle.graffle b/docs/image_sources/activity_lifecycle.graffle index 7475c67..7475c67 100644 --- a/docs/html/images/activity_lifecycle.graffle +++ b/docs/image_sources/activity_lifecycle.graffle diff --git a/docs/html/images/brand/Android_Robot_outlined.ai b/docs/image_sources/brand/Android_Robot_outlined.ai index 9105cba..9105cba 100644 --- a/docs/html/images/brand/Android_Robot_outlined.ai +++ b/docs/image_sources/brand/Android_Robot_outlined.ai diff --git a/docs/html/images/brand/Google_Play_Store.ai b/docs/image_sources/brand/Google_Play_Store.ai index 51f07c6..51f07c6 100644 --- a/docs/html/images/brand/Google_Play_Store.ai +++ b/docs/image_sources/brand/Google_Play_Store.ai diff --git a/docs/html/images/brand/en_app_rgb_wo.ai b/docs/image_sources/brand/en_app_rgb_wo.ai index db27314..db27314 100644 --- a/docs/html/images/brand/en_app_rgb_wo.ai +++ b/docs/image_sources/brand/en_app_rgb_wo.ai diff --git a/docs/html/images/brand/en_generic_rgb_wo.ai b/docs/image_sources/brand/en_generic_rgb_wo.ai index 57c1e47..57c1e47 100644 --- a/docs/html/images/brand/en_generic_rgb_wo.ai +++ b/docs/image_sources/brand/en_generic_rgb_wo.ai diff --git a/docs/html/images/fundamentals/fragments.graffle b/docs/image_sources/fundamentals/fragments.graffle index c14282b..c14282b 100644 --- a/docs/html/images/fundamentals/fragments.graffle +++ b/docs/image_sources/fundamentals/fragments.graffle diff --git a/docs/html/images/fundamentals/restore_instance.graffle b/docs/image_sources/fundamentals/restore_instance.graffle index 7489aeb..7489aeb 100644 --- a/docs/html/images/fundamentals/restore_instance.graffle +++ b/docs/image_sources/fundamentals/restore_instance.graffle diff --git a/docs/html/images/fundamentals/service_lifecycle.graffle b/docs/image_sources/fundamentals/service_lifecycle.graffle index 73a17a2..73a17a2 100644 --- a/docs/html/images/fundamentals/service_lifecycle.graffle +++ b/docs/image_sources/fundamentals/service_lifecycle.graffle diff --git a/docs/html/images/providers/datamodel.graffle b/docs/image_sources/providers/datamodel.graffle index f8d730f..f8d730f 100644 --- a/docs/html/images/providers/datamodel.graffle +++ b/docs/image_sources/providers/datamodel.graffle diff --git a/docs/html/images/resources/res-selection-flowchart.graffle b/docs/image_sources/resources/res-selection-flowchart.graffle index 2d64735..2d64735 100644 --- a/docs/html/images/resources/res-selection-flowchart.graffle +++ b/docs/image_sources/resources/res-selection-flowchart.graffle diff --git a/docs/html/images/resources/resource_devices_diagram.graffle b/docs/image_sources/resources/resource_devices_diagram.graffle index ab71dd1..ab71dd1 100644 --- a/docs/html/images/resources/resource_devices_diagram.graffle +++ b/docs/image_sources/resources/resource_devices_diagram.graffle diff --git a/docs/html/images/rs_compute.graffle b/docs/image_sources/rs_compute.graffle index 3fa8c67..3fa8c67 100644 --- a/docs/html/images/rs_compute.graffle +++ b/docs/image_sources/rs_compute.graffle diff --git a/docs/html/images/rs_graphics.graffle b/docs/image_sources/rs_graphics.graffle index 5dee4c6..5dee4c6 100644 --- a/docs/html/images/rs_graphics.graffle +++ b/docs/image_sources/rs_graphics.graffle diff --git a/docs/html/images/rs_overview.graffle b/docs/image_sources/rs_overview.graffle index 5613744..5613744 100644 --- a/docs/html/images/rs_overview.graffle +++ b/docs/image_sources/rs_overview.graffle diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf b/docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf Binary files differindex aa97f22..aa97f22 100644 --- a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf +++ b/docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff b/docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff Binary files differindex 55c1157..55c1157 100644 --- a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff +++ b/docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/data.plist b/docs/image_sources/training/basics/basic-lifecycle.graffle/data.plist index 28c03f5..28c03f5 100644 --- a/docs/html/images/training/basics/basic-lifecycle.graffle/data.plist +++ b/docs/image_sources/training/basics/basic-lifecycle.graffle/data.plist diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/image1.png b/docs/image_sources/training/basics/basic-lifecycle.graffle/image1.png Binary files differindex cc606c9..cc606c9 100644 --- a/docs/html/images/training/basics/basic-lifecycle.graffle/image1.png +++ b/docs/image_sources/training/basics/basic-lifecycle.graffle/image1.png diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf Binary files differindex 192bb8d..192bb8d 100644 --- a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf +++ b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff Binary files differindex 85dd23d..85dd23d 100644 --- a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff +++ b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/data.plist b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/data.plist index 3c391df..3c391df 100644 --- a/docs/html/images/training/basic-simple-screen-mock.graffle/data.plist +++ b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/data.plist diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/image1.png b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image1.png Binary files differindex 80baf14..80baf14 100644 --- a/docs/html/images/training/basic-simple-screen-mock.graffle/image1.png +++ b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image1.png diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/image2.png b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image2.png Binary files differindex f478d16..f478d16 100644 --- a/docs/html/images/training/basic-simple-screen-mock.graffle/image2.png +++ b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image2.png diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf b/docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Preview.pdf Binary files differindex 19ccd0f..19ccd0f 100644 --- a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf +++ b/docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Preview.pdf diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff b/docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff Binary files differindex 8d5c9c6..8d5c9c6 100644 --- a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff +++ b/docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist b/docs/image_sources/training/fragments-screen-mock.graffle/data.plist index 5602c16..5602c16 100644 --- a/docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist +++ b/docs/image_sources/training/fragments-screen-mock.graffle/data.plist diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png b/docs/image_sources/training/fragments-screen-mock.graffle/image1.png Binary files differindex 80baf14..80baf14 100644 --- a/docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png +++ b/docs/image_sources/training/fragments-screen-mock.graffle/image1.png diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png b/docs/image_sources/training/fragments-screen-mock.graffle/image2.png Binary files differindex f478d16..f478d16 100644 --- a/docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png +++ b/docs/image_sources/training/fragments-screen-mock.graffle/image2.png diff --git a/docs/html/images/ui/actionbar-navigate-up.xcf b/docs/image_sources/ui/actionbar-navigate-up.xcf Binary files differindex bf1849a..bf1849a 100644 --- a/docs/html/images/ui/actionbar-navigate-up.xcf +++ b/docs/image_sources/ui/actionbar-navigate-up.xcf |
