Skip to content

Commit 79662a4

Browse files
committed
fixed Gradle Android build
1 parent cbad5b7 commit 79662a4

6 files changed

Lines changed: 21 additions & 36 deletions

File tree

com.vogella.android.build.firstgradle/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ android {
3434
}
3535

3636
android {
37+
buildToolsVersion "17.0"
3738
compileSdkVersion 17
3839

3940
sourceSets {

com.vogella.android.customview.compoundview/res/layout/activity_main.xml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,28 @@
33
xmlns:custom="http://schemas.android.com/apk/res/com.vogella.android.view.compoundview"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6+
android:divider="?android:attr/listDivider"
67
android:orientation="vertical"
78
android:showDividers="middle"
8-
android:divider="?android:attr/listDivider"
99
tools:context=".MainActivity" >
1010

11-
<com.vogella.android.customview.compoundview.ColorOptionsView
12-
android:id="@+id/view1"
13-
android:layout_width="match_parent"
14-
android:layout_height="?android:attr/listPreferredItemHeight"
15-
android:background="?android:selectableItemBackground"
16-
android:onClick="onClicked"
17-
custom:titleText="Background color"
18-
custom:valueColor="@android:color/holo_green_light"
19-
/>
11+
<com.vogella.android.customview.compoundview.ColorOptionsView
12+
android:id="@+id/view1"
13+
android:layout_width="match_parent"
14+
android:layout_height="?android:attr/listPreferredItemHeight"
15+
android:background="?android:selectableItemBackground"
16+
android:onClick="onClicked"
17+
custom:titleText="Background color"
18+
custom:valueColor="@android:color/holo_green_light" />
2019

21-
<com.vogella.android.customview.compoundview.ColorOptionsView
22-
android:id="@+id/view2"
23-
android:layout_width="match_parent"
24-
android:layout_height="?android:attr/listPreferredItemHeight"
25-
android:background="?android:selectableItemBackground"
26-
android:onClick="onClicked"
27-
custom:titleText="Foreground color"
28-
custom:valueColor="@android:color/holo_orange_dark"
29-
/>
20+
<com.vogella.android.customview.compoundview.ColorOptionsView
21+
android:id="@+id/view2"
22+
23+
android:layout_width="match_parent"
24+
android:layout_height="?android:attr/listPreferredItemHeight"
25+
android:background="?android:selectableItemBackground"
26+
android:onClick="onClicked"
27+
custom:titleText="Foreground color"
28+
custom:valueColor="@android:color/holo_orange_dark" />
3029

3130
</LinearLayout>

com.vogella.android.customview.compoundview/res/xml/attrs.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

com.vogella.android.locationapi.maps/src/com/vogella/android/locationapi/maps/MainActivity.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
import android.os.Bundle;
55
import android.view.Menu;
66

7-
import com.google.android.gms.maps.CameraUpdateFactory;
8-
import com.google.android.gms.maps.GoogleMap;
9-
import com.google.android.gms.maps.MapFragment;
10-
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
11-
import com.google.android.gms.maps.model.LatLng;
12-
import com.google.android.gms.maps.model.Marker;
13-
import com.google.android.gms.maps.model.MarkerOptions;
14-
157
public class MainActivity extends Activity {
168
static final LatLng HAMBURG = new LatLng(53.558, 9.927);
179
static final LatLng KIEL = new LatLng(53.551, 9.993);

de.vogella.android.locationapi.maps/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# project structure.
99

1010
# Project target.
11-
target=Google Inc.:Google APIs:15
11+
target=Google Inc.:Google APIs:17

de.vogella.android.ownservice.local/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<service
2525
android:name=".LocalWordService"
26+
android:process="meinprocess"
2627
android:icon="@drawable/icon"
2728
android:label="@string/service_name" >
2829
</service>

0 commit comments

Comments
 (0)