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

Commit c5a1c136 authored by Ricardo Cervera's avatar Ricardo Cervera
Browse files

resolved conflicts for merge of 6302a72a to master 

Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
parents 70f52f6a 6302a72a

docs/html/sdk/index.jd

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

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

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

+3 −7
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ enhancements. </p> 
    <p>The <em>Ctrl + D</em> key binding is great for quickly duplicating code lines or fragments.

    Simply select the desired line or fragment and enter this key binding. </p>





    <h3>Navigate menu</h3>

    <p>In case you're not familiar with an API class, file or symbol, the <em>Navigate</em> menu lets

    you jump directly to the class of a method or field name without having to search through
@@ -157,12 +156,9 @@ enhancements. </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> &gt; <strong>Settings</strong> &gt; <strong>Keymap</strong>. To change

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

<strong>Preferences</strong> &gt; <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> &gt; <strong>Settings</strong> &gt; <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>