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

Commit 6302a72a authored by Ricardo Cervera's avatar Ricardo Cervera Committed by Android Git Automerger
Browse files

am 934c8ddc: am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor... 

am 934c8ddc: am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages.

* commit '934c8ddc':
  docs: Minor fixes in Android Studio pages.
parents 5e1b4a0c 934c8ddc

docs/html/sdk/index.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -449,7 +449,7 @@ Studio</a>.</p> 
<ul>

<ul>

<li>Microsoft&reg;  Windows&reg;  8/7/Vista/2003 (32 or 64-bit)</li>

<li>Microsoft&reg;  Windows&reg;  8/7/Vista/2003 (32 or 64-bit)</li>

<li>2 GB RAM minimum, 4 GB RAM recommended</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>1280 x 800  minimum screen resolution</li>

<li>Java Development Kit (JDK) 7 </li>

<li>Java Development Kit (JDK) 7 </li>

<li>Optional for accelerated emulator: Intel® processor with support for Intel® VT-x, Intel® EM64T

<li>Optional for accelerated emulator: Intel® processor with support for Intel® VT-x, Intel® EM64T

docs/html/sdk/installing/studio-tips.jd

+3 −11
Original line number Original line Diff line number Diff line
@@ -91,11 +91,6 @@ practices you should consider using when creating Android Studio apps. </p> 
is based), refer to the

is based), refer to the

<a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA documentation</a>.</p>

<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>

<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>

<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

<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

for the default keymap. To change the default keymap on Windows and Linux, go to

<strong>File</strong> &gt; <strong>Settings</strong> &gt; <strong>Keymap</strong>. To change

<strong>File</strong> &gt; <strong>Settings</strong> &gt; <strong>Keymap</strong>. If you're

the default keymap on Mac OS X, go to <strong>Android Studio</strong> &gt;

using Mac OS X, update your keymap to use the Mac OS X 10.5+ version keymaps under

<strong>Preferences</strong> &gt; <strong>Keymap</strong>.</p>

<strong>Android Studio > Preferences > 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>









<p class="table-caption"><strong>Table 1.</strong> Programming key commands</p>

<p class="table-caption"><strong>Table 1.</strong> Programming key commands</p>