Skip to content

Commit 6687a01

Browse files
committed
Actualización proyectos a Android 4.2 y SDK r21
1 parent 9478b89 commit 6687a01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+115
-59
lines changed

android-botones/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-botones/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-check-radio/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-check-radio/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-control-pers-1/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-control-pers-1/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-control-pers-2/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-control-pers-2/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-control-pers-3/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-control-pers-3/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-dialogos/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-dialogos/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-gridview/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-gridview/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-hola-usuario/AndroidManifest.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23
package="net.sgoliver.android.holausuario"
34
android:versionCode="1"
45
android:versionName="1.0" >
56

67
<uses-sdk
78
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
9+
android:targetSdkVersion="17" />
910

1011
<application
12+
android:allowBackup="true"
1113
android:icon="@drawable/ic_launcher"
1214
android:label="@string/app_name"
1315
android:theme="@style/AppTheme" >
1416
<activity
15-
android:name=".MainActivity"
16-
android:label="@string/title_activity_main" >
17+
android:name="net.sgoliver.android.holausuario.MainActivity"
18+
android:label="@string/app_name" >
1719
<intent-filter>
1820
<action android:name="android.intent.action.MAIN" />
1921

@@ -25,6 +27,7 @@
2527
android:label="@string/title_activity_saludo" >
2628

2729
</activity>
30+
2831
</application>
2932

3033
</manifest>

android-hola-usuario/gen/net/sgoliver/android/holausuario/R.java

+30-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public final class R {
1111
public static final class attr {
1212
}
1313
public static final class drawable {
14-
public static final int ic_action_search=0x7f020000;
15-
public static final int ic_launcher=0x7f020001;
14+
public static final int ic_launcher=0x7f020000;
1615
}
1716
public static final class id {
1817
public static final int BtnHola=0x7f070003;
@@ -32,13 +31,37 @@ public static final class menu {
3231
public static final class string {
3332
public static final int app_name=0x7f040000;
3433
public static final int hello_world=0x7f040001;
35-
public static final int hola=0x7f040005;
34+
public static final int hola=0x7f040004;
3635
public static final int menu_settings=0x7f040002;
37-
public static final int nombre=0x7f040004;
38-
public static final int title_activity_main=0x7f040003;
39-
public static final int title_activity_saludo=0x7f040006;
36+
public static final int nombre=0x7f040003;
37+
public static final int title_activity_saludo=0x7f040005;
4038
}
4139
public static final class style {
42-
public static final int AppTheme=0x7f050000;
40+
/**
41+
Base application theme, dependent on API level. This theme is replaced
42+
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
43+
44+
45+
Theme customizations available in newer API levels can go in
46+
res/values-vXX/styles.xml, while customizations related to
47+
backward-compatibility can go here.
48+
49+
50+
Base application theme for API 11+. This theme completely replaces
51+
AppBaseTheme from res/values/styles.xml on API 11+ devices.
52+
53+
API 11 theme customizations can go here.
54+
55+
Base application theme for API 14+. This theme completely replaces
56+
AppBaseTheme from BOTH res/values/styles.xml and
57+
res/values-v11/styles.xml on API 14+ devices.
58+
59+
API 14 theme customizations can go here.
60+
*/
61+
public static final int AppBaseTheme=0x7f050000;
62+
/** Application theme.
63+
All customizations that are NOT specific to a particular API-level can go here.
64+
*/
65+
public static final int AppTheme=0x7f050001;
4366
}
4467
}
18.2 KB
35.6 KB
Binary file not shown.

android-hola-usuario/lint.xml

-3
This file was deleted.

android-hola-usuario/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
<menu xmlns:android="http://schemas.android.com/apk/res/android">
2-
<item android:id="@+id/menu_settings"
3-
android:title="@string/menu_settings"
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
3+
<item
4+
android:id="@+id/menu_settings"
45
android:orderInCategory="100"
5-
android:showAsAction="never" />
6-
</menu>
6+
android:showAsAction="never"
7+
android:title="@string/menu_settings"/>
8+
9+
</menu>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<resources>
22

3-
<style name="AppTheme" parent="android:Theme.Holo.Light" />
3+
<!--
4+
Base application theme for API 11+. This theme completely replaces
5+
AppBaseTheme from res/values/styles.xml on API 11+ devices.
6+
-->
7+
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
8+
<!-- API 11 theme customizations can go here. -->
9+
</style>
410

511
</resources>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<resources>
22

3-
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
3+
<!--
4+
Base application theme for API 14+. This theme completely replaces
5+
AppBaseTheme from BOTH res/values/styles.xml and
6+
res/values-v11/styles.xml on API 14+ devices.
7+
-->
8+
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
9+
<!-- API 14 theme customizations can go here. -->
10+
</style>
411

512
</resources>

android-hola-usuario/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<resources>
23

34
<string name="app_name">Hola Usuario</string>
45
<string name="hello_world">Hello world!</string>
56
<string name="menu_settings">Settings</string>
6-
<string name="title_activity_main">Hola Usuario</string>
77
<string name="nombre">Escribe tu nombre:</string>
88
<string name="hola">Hola</string>
99
<string name="title_activity_saludo">Saludo</string>
+16-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
<resources>
22

3-
<style name="AppTheme" parent="android:Theme.Light" />
3+
<!--
4+
Base application theme, dependent on API level. This theme is replaced
5+
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
6+
-->
7+
<style name="AppBaseTheme" parent="android:Theme.Light">
8+
<!--
9+
Theme customizations available in newer API levels can go in
10+
res/values-vXX/styles.xml, while customizations related to
11+
backward-compatibility can go here.
12+
-->
13+
</style>
14+
15+
<!-- Application theme. -->
16+
<style name="AppTheme" parent="AppBaseTheme">
17+
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
18+
</style>
419

520
</resources>

android-hola-usuario/src/net/sgoliver/android/holausuario/MainActivity.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
public class MainActivity extends Activity {
1313

14-
@Override
15-
public void onCreate(Bundle savedInstanceState) {
16-
super.onCreate(savedInstanceState);
17-
setContentView(R.layout.activity_main);
18-
19-
//Obtenemos una referencia a los controles de la interfaz
14+
@Override
15+
protected void onCreate(Bundle savedInstanceState) {
16+
super.onCreate(savedInstanceState);
17+
setContentView(R.layout.activity_main);
18+
19+
//Obtenemos una referencia a los controles de la interfaz
2020
final EditText txtNombre = (EditText)findViewById(R.id.TxtNombre);
2121
final Button btnHola = (Button)findViewById(R.id.BtnHola);
2222

@@ -37,11 +37,13 @@ public void onClick(View v) {
3737
startActivity(intent);
3838
}
3939
});
40-
}
40+
}
41+
42+
@Override
43+
public boolean onCreateOptionsMenu(Menu menu) {
44+
// Inflate the menu; this adds items to the action bar if it is present.
45+
getMenuInflater().inflate(R.menu.activity_main, menu);
46+
return true;
47+
}
4148

42-
@Override
43-
public boolean onCreateOptionsMenu(Menu menu) {
44-
getMenuInflater().inflate(R.menu.activity_main, menu);
45-
return true;
46-
}
4749
}

android-imagen-texto/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-imagen-texto/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-listview-opt/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-listview-opt/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-listview/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-listview/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-spinner/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-spinner/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

android-tabs/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="8"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

android-tabs/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-16
14+
target=android-17

0 commit comments

Comments
 (0)