diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-06 22:22:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 22:22:27 +0000 |
| commit | ebc2872929177c4780c68a0371a44c25f89a4f1f (patch) | |
| tree | 2da7dc298ee14e9f31d27e68bdf5009aefa6fbfe /docs | |
| parent | 94c4b4b2a5c368a4894bbd8a42301f7ce443129b (diff) | |
| parent | e7d1db56324e406a074bf0c44e778060b07d2322 (diff) | |
| download | frameworks_base-ebc2872929177c4780c68a0371a44c25f89a4f1f.zip frameworks_base-ebc2872929177c4780c68a0371a44c25f89a4f1f.tar.gz frameworks_base-ebc2872929177c4780c68a0371a44c25f89a4f1f.tar.bz2 | |
am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages.
* commit 'e7d1db56324e406a074bf0c44e778060b07d2322':
docs: Minor fixes in Android Studio pages.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/index.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/installing/studio-tips.jd | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 5d73d72..d9a47a2 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -449,7 +449,7 @@ Studio</a>.</p> <ul> <li>Microsoft® Windows® 8/7/Vista/2003 (32 or 64-bit)</li> <li>2 GB RAM minimum, 4 GB RAM recommended</li> -<li>400 MB hard disk space + at least 1 G for Android SDK, emulator system images, and caches</li> +<li>400 MB hard disk space + at least 1 GB for Android SDK, emulator system images, and caches</li> <li>1280 x 800 minimum screen resolution</li> <li>Java Development Kit (JDK) 7 </li> <li>Optional for accelerated emulator: Intel® processor with support for Intel® VT-x, Intel® EM64T diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd index 614615e..69c188c 100644 --- a/docs/html/sdk/installing/studio-tips.jd +++ b/docs/html/sdk/installing/studio-tips.jd @@ -91,11 +91,6 @@ practices you should consider using when creating Android Studio apps. </p> is based), refer to the <a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA documentation</a>.</p> -<h3>External annotations</h3> -<p>Specify annotations within the code or from an external annotation file. The Android Studio -IDE keeps track of the restrictions and validates compliance, for example setting the data type -of a string as not null.</p> - <h3><em>Alt + Enter</em> key binding</h3> <p>For quick fixes to coding errors, the IntelliJ powered IDE implements the <em>Alt + Enter</em> @@ -169,12 +164,9 @@ various attributes.</p> <p class="note"><strong>Note:</strong> This section lists Android Studio keyboard shortcuts for the default keymap. To change the default keymap on Windows and Linux, go to -<strong>File</strong> > <strong>Settings</strong> > <strong>Keymap</strong>. To change -the default keymap on Mac OS X, go to <strong>Android Studio</strong> > -<strong>Preferences</strong> > <strong>Keymap</strong>.</p> - -<p class="note"><strong>Note:</strong> If you're using Mac OS X, update your keymap to use -the Mac OS X 10.5+ version keymaps under <strong>Android Studio > Preferences > Keymap</strong>.</p> +<strong>File</strong> > <strong>Settings</strong> > <strong>Keymap</strong>. If you're +using Mac OS X, update your keymap to use the Mac OS X 10.5+ version keymaps under +<strong>Android Studio > Preferences > Keymap</strong>.</p> <p class="table-caption"><strong>Table 1.</strong> Programming key commands</p> |