aboutsummaryrefslogtreecommitdiff
path: root/en/source/code-style.html
diff options
context:
space:
mode:
Diffstat (limited to 'en/source/code-style.html')
-rw-r--r--en/source/code-style.html15
1 files changed, 11 insertions, 4 deletions
diff --git a/en/source/code-style.html b/en/source/code-style.html
index ab35a9ab..b13feb4a 100644
--- a/en/source/code-style.html
+++ b/en/source/code-style.html
@@ -23,10 +23,17 @@
-<p>The code styles below are strict rules, not guidelines or recommendations.
-Contributions to Android that do not adhere to these rules are generally <em>not
-accepted</em>. We recognize that not all existing code follows these rules, but
-we expect all new code to be compliant.</p>
+<p>The code styles below are strict rules for contributing Java code to the
+Android Open Source Project (AOSP). Contributions to the Android platform that
+do not adhere to these rules are generally <em>not accepted</em>. We recognize
+that not all existing code follows these rules, but we expect all new code to
+be compliant.</p>
+
+<p class="note"><strong>Note:</strong> These rules are intended for the Android
+platform and are not required of Android app developers. App developers may
+follow the standard of their choosing, such as the <a
+href="https://google.github.io/styleguide/javaguide.html">Google Java Style
+Guide</a>.</p>
<h2 id="java-language-rules">Java Language Rules</h2>
<p>Android follows standard Java coding conventions with the additional rules