diff options
| author | David Turner <digit@android.com> | 2011-02-28 10:07:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 10:07:16 -0800 |
| commit | a7a4a16d5e0552c1a64a2f8205fe42089d4df2af (patch) | |
| tree | 32cde46f2b9c88fe792a5815c503d8c5f2279221 /ide | |
| parent | 9c34033458800742b6c932124bafb358824b7436 (diff) | |
| parent | 0b80c5e83c057c42d3e3699593d89525c01a4096 (diff) | |
| download | android_development-a7a4a16d5e0552c1a64a2f8205fe42089d4df2af.tar.gz android_development-a7a4a16d5e0552c1a64a2f8205fe42089d4df2af.tar.bz2 android_development-a7a4a16d5e0552c1a64a2f8205fe42089d4df2af.zip | |
am 0b80c5e8: am d2454506: Merge "Move files to proper location in development/ndk/platforms"
* commit '0b80c5e83c057c42d3e3699593d89525c01a4096':
Line Wrapping General settings Set "Never join already wrapped lines" to true.
Move files to proper location in development/ndk/platforms
Blank Lines within class declarations Set "Before field declarations" value to 0.
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/eclipse/android-formatting.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ide/eclipse/android-formatting.xml b/ide/eclipse/android-formatting.xml index a64d4c664..9b4376700 100644 --- a/ide/eclipse/android-formatting.xml +++ b/ide/eclipse/android-formatting.xml @@ -24,7 +24,7 @@ <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> @@ -247,5 +247,6 @@ <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/> </profile> </profiles> |