From 7444618522e6cfceed791e7c168eb887f14f42b3 Mon Sep 17 00:00:00 2001 From: serso Date: Mon, 11 May 2015 16:08:15 +0200 Subject: [PATCH 1/6] Android Studio 1.2 Support --- .idea/codeStyleSettings.xml | 269 +++++++++++++----------- .idea/gradle.xml | 4 +- .idea/misc.xml | 104 +-------- .idea/runConfigurations/Run.xml | 4 + android-app-tests/android-app-tests.iml | 41 ++-- android-app/android-app.iml | 8 +- calculatorpp.iml | 6 +- core/core.iml | 9 +- 8 files changed, 188 insertions(+), 257 deletions(-) diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 38ef164f..eee0ba6d 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -62,125 +62,153 @@ - - - - xmlns:android - Namespace: - - - - - - - xmlns:.* - Namespace: - - - BY_NAME - - - - - .*:id - http://schemas.android.com/apk/res/android - - - - - - - .*:name - http://schemas.android.com/apk/res/android - - - - - - - name - ^$ - - - - - - - style - ^$ - - - - - - - .* - ^$ - - - BY_NAME - - - - - .*:layout_width - http://schemas.android.com/apk/res/android - - - - - - - .*:layout_height - http://schemas.android.com/apk/res/android - - - - - - - .*:layout_.* - http://schemas.android.com/apk/res/android - - - BY_NAME - - - - - .*:width - http://schemas.android.com/apk/res/android - - - BY_NAME - - - - - .*:height - http://schemas.android.com/apk/res/android - - - BY_NAME - - - - - .* - http://schemas.android.com/apk/res/android - - - BY_NAME - - - - - .* - .* - - - BY_NAME - +
+ + + + xmlns:android + Namespace: + + + +
+
+ + + + xmlns:.* + Namespace: + + + BY_NAME + +
+
+ + + + .*:id + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + ^$ + + + +
+
+ + + + style + ^$ + + + +
+
+ + + + .* + ^$ + + + BY_NAME + +
+
+ + + + .*:layout_width + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:layout_height + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:layout_.* + http://schemas.android.com/apk/res/android + + + BY_NAME + +
+
+ + + + .*:width + http://schemas.android.com/apk/res/android + + + BY_NAME + +
+
+ + + + .*:height + http://schemas.android.com/apk/res/android + + + BY_NAME + +
+
+ + + + .* + http://schemas.android.com/apk/res/android + + + BY_NAME + +
+
+ + + + .* + .* + + + BY_NAME + +
@@ -188,5 +216,4 @@