Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge java part

This commit is contained in:
Maksim Gamarnik 2015-05-10 10:24:51 +03:00 committed by OttoLidenbrock
parent 109b60c0c7
commit 0b51656f9b
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/android/AndroidManifest.xml.template
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="mobi.MultiCraft"
android:installLocation="auto"
android:versionCode="###ANDROID_VERSION###"
android:versionName="###BASE_VERSION###.###ANDROID_VERSION###" >
@ -22,9 +23,6 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/MTTheme" >
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<activity
android:name="com.MoNTE48.MultiCraft.MainActivity"

3
build/android/project.properties
View File

@ -1,2 +1 @@
target=android-22
android.library.reference.1=../google-play-services_lib
target=android-22

2
build/android/res/layout/activity_main.xml
View File

@ -21,7 +21,7 @@
android:layout_above="@+id/PB1"
android:layout_centerHorizontal="true"
android:paddingBottom="16dp"
android:text="@string/starting"
android:text="@string/loading"
android:textColor="#FFFFFF"
android:textSize="24sp" />

2
build/android/res/layout/instruction_dialog.xml
View File

@ -12,6 +12,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
android:text="@string/app_description" />
android:text="@string/dialog_instruction" />
</LinearLayout>

2
build/android/src/com/MoNTE48/MultiCraft/MainActivity.java
View File

@ -163,7 +163,7 @@ public class MainActivity extends Activity implements IUtilitiesCallback {
}
private void startBetweenActivity() {
showSpinnerDialog(R.string.starting);
showSpinnerDialog(R.string.loading);
new Thread(new Runnable() {
public void run() {
Intent intent = new Intent(MainActivity.this,

4
build/android/src/com/MoNTE48/MultiCraft/UnzipService.java
View File

@ -42,8 +42,8 @@ public class UnzipService extends IntentService {
protected void onHandleIntent(Intent intent) {
NotificationManager mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
Notification.Builder mBuilder = new Notification.Builder(this);
mBuilder.setContentTitle(getString(R.string.extract))
.setContentText(getString(R.string.unpack))
mBuilder.setContentTitle(getString(R.string.notification_title))
.setContentText(getString(R.string.notification_description))
.setSmallIcon(R.drawable.ic_launcher);
String file = intent.getStringExtra(EXTRA_KEY_IN_FILE);
String location = intent.getStringExtra(EXTRA_KEY_IN_LOCATION);