Index: docs/android_studio.md |
diff --git a/docs/android_studio.md b/docs/android_studio.md |
index 125f98061e6981a8480575161f187f3605b53935..96ef1752ef52997d61c39137f34ae368f94d3984 100644 |
--- a/docs/android_studio.md |
+++ b/docs/android_studio.md |
@@ -13,8 +13,8 @@ This creates a project at `out-gn/Debug/gradle`. To create elsewhere: `--project |
For first-time Android Studio users: |
* Avoid running the setup wizard. |
- * The wizard will force you to download unwanted SDK componentns to `//third_party/android_tools`. |
- * To skip it. Select "Cancel" when it comes up. |
+ * The wizard will force you to download unwanted SDK components to `//third_party/android_tools`. |
+ * To skip it, select "Cancel" when it comes up. |
To import the project: |
@@ -23,7 +23,7 @@ To import the project: |
You need to re-run `generate_gradle.py` whenever `BUILD.gn` files change. |
* After regenerating, Android Studio should prompt you to "Sync". If it doesn't, use: |
- * Help->Find Action->Sync Project with Gradle Files |
+ * Help -> Find Action -> Sync Project with Gradle Files |
## How it Works |
@@ -54,7 +54,28 @@ all to `extracted-srcjars/` subdirectories for each target that contains them. |
includes `R.java`). |
*** |
-### Building with Gradle |
+## Android Studio Tips |
+ |
+ * Configuration instructions can be found [here](http://tools.android.com/tech-docs/configuration). One suggestions: |
+ * Launch it with more RAM: `STUDIO_VM_OPTIONS=-Xmx2048m /opt/android-studio-stable/bin/studio-launcher.sh` |
+ * If you ever need to reset it: `rm -r ~/.AndroidStudio*/` |
+ * Import Android style settings: |
+ * Help -> Find Action -> Code Style -> Java -> Manage -> Import |
+ * Select `third_party/android_platform/development/ide/intellij/codestyles/AndroidStyle.xml` |
+ |
+### Useful Shortcuts |
+ |
+ * `Shift - Shift`: Search to open file or perform IDE action |
+ * `Ctrl + N`: Jump to class |
+ * `Ctrl + Shift + T`: Jump to test |
+ * `Ctrl + Shift + N`: Jump to file |
+ * `Ctrl + F12`: Jump to method |
+ * `Ctrl + G`: Jump to line |
+ * `Shift + F6`: Rename variable |
+ * `Ctrl + Alt + O`: Organize imports |
+ * `Alt + Enter`: Quick Fix (use on underlined errors) |
+ |
+### Building from the Command Line |
Gradle builds can be done from the command-line after importing the project into |
Android Studio (importing into the IDE causes the Gradle wrapper to be added). |
@@ -66,12 +87,12 @@ resources, native libraries, etc. |
## Status (as of Sept 21, 2016) |
-### What currently works |
+### What works |
* Tested with Android Studio v2.2. |
* Basic Java editing and compiling works. |
-### Roadmap / what's not yet implemented ([crbug](https://bugs.chromium.org/p/chromium/issues/detail?id=620034)) |
+### What doesn't work (yet) ([crbug](https://bugs.chromium.org/p/chromium/issues/detail?id=620034)) |
* JUnit Test targets |
* Better support for instrumtation tests (they are treated as non-test .apks right now) |
@@ -80,22 +101,3 @@ resources, native libraries, etc. |
* Add a mode in which gradle is responsible for generating `R.java` |
* Add support for native code editing |
* Make the "Make Project" button work correctly |
- |
-## Android Studio Tips |
- |
- * Configuration instructions can be found [here](http://tools.android.com/tech-docs/configuration). One suggestions: |
- * Launch it with more RAM: `STUDIO_VM_OPTIONS=-Xmx2048m /opt/android-studio-stable/bin/studio-launcher.sh` |
- * If you ever need to reset it: `rm -r ~/.AndroidStudio*/` |
- |
-### Useful Shortcuts |
- |
- * `Shift - Shift`: Search to open file or perform IDE action |
- * `Ctrl + N`: Jump to class |
- * `Ctrl + Shift + T`: Jump to test |
- * `Ctrl + Shift + N`: Jump to file |
- * `Ctrl + F12`: Jump to method |
- * `Ctrl + G`: Jump to line |
- * `Shift + F6`: Rename variable |
- * `Ctrl + Alt + O`: Organize imports |
- * `Alt + Enter`: Quick Fix (use on underlined errors) |
- |