Merge branch 'merge-requests/164'
This commit is contained in:
commit
3632f0bafe
|
@ -25,11 +25,16 @@ prebuild=sed -i -e '18 s/>//g' -e '19 a android:versionCode="1"\nandroid:version
|
||||||
AndroidManifest.xml,\
|
AndroidManifest.xml,\
|
||||||
build=$$NDK$$/ndk-build APP_BUILD_SCRIPT=Android.mk
|
build=$$NDK$$/ndk-build APP_BUILD_SCRIPT=Android.mk
|
||||||
|
|
||||||
Build Version:1.3.5.1,2,android-4.0.4_r2.1,\
|
Build Version:1.3.5.1,2,!causes same crash as above - android-4.0.4_r2.1,\
|
||||||
target=android-14,\
|
target=android-14,\
|
||||||
patch=styles_2.patch,\
|
patch=styles_2.patch,\
|
||||||
build=$$NDK$$/ndk-build APP_BUILD_SCRIPT=Android.mk
|
build=$$NDK$$/ndk-build APP_BUILD_SCRIPT=Android.mk
|
||||||
|
|
||||||
|
Build Version:1.3.5.2,3,android-4.0.4_r2.1,\
|
||||||
|
target=android-14,\
|
||||||
|
patch=styles_3.patch,\
|
||||||
|
build=$$NDK$$/ndk-build APP_BUILD_SCRIPT=Android.mk
|
||||||
|
|
||||||
Build Version:1.3.6,136,!https://f-droid.org/forums/topic/opewnn-ics at android-4.1.2_r2,\
|
Build Version:1.3.6,136,!https://f-droid.org/forums/topic/opewnn-ics at android-4.1.2_r2,\
|
||||||
target=android-15,\
|
target=android-15,\
|
||||||
prebuild=sed -i ' 18 i android:versionCode="136"\nandroid:versionName="1.3.6"' \
|
prebuild=sed -i ' 18 i android:versionCode="136"\nandroid:versionName="1.3.6"' \
|
||||||
|
@ -40,6 +45,6 @@ buildjni=libs
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
Update Check Mode:Static
|
Update Check Mode:Static
|
||||||
Current Version:1.3.5.1
|
Current Version:1.3.5.2
|
||||||
Current Version Code:2
|
Current Version Code:3
|
||||||
|
|
||||||
|
|
37
metadata/jp.co.omronsoft.openwnn/styles_3.patch
Normal file
37
metadata/jp.co.omronsoft.openwnn/styles_3.patch
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
|
||||||
|
index 2ce1ae6..3e384bb 100644
|
||||||
|
--- a/AndroidManifest.xml
|
||||||
|
+++ b/AndroidManifest.xml
|
||||||
|
@@ -15,12 +15,16 @@
|
||||||
|
-->
|
||||||
|
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
- package="jp.co.omronsoft.openwnn">
|
||||||
|
+ package="jp.co.omronsoft.openwnn"
|
||||||
|
+ android:versionCode="3"
|
||||||
|
+ android:versionName="1.3.5.2">
|
||||||
|
|
||||||
|
<original-package android:name="jp.co.omronsoft.openwnn" />
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/>
|
||||||
|
<uses-permission xmlns:android="http://schemas.android.com/apk/res/android" android:name="android.permission.VIBRATE"/>
|
||||||
|
- <application android:label="OpenWnn">
|
||||||
|
+ <application android:label="OpenWnn"
|
||||||
|
+ android:theme="@style/Theme">
|
||||||
|
|
||||||
|
<service android:name="OpenWnnJAJP" android:label="Japanese IME"
|
||||||
|
android:permission="android.permission.BIND_INPUT_METHOD"
|
||||||
|
diff --git a/res/values/styles.xml b/res/values/styles.xml
|
||||||
|
index e69de29..26ba049 100644
|
||||||
|
--- a/res/values/styles.xml
|
||||||
|
+++ b/res/values/styles.xml
|
||||||
|
@@ -0,0 +1,7 @@
|
||||||
|
+<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
+<resources>
|
||||||
|
+ <style name="Theme" parent="@android:style/Theme.Holo">
|
||||||
|
+ <item name="android:windowActionBar">false</item>
|
||||||
|
+ <item name="android:windowNoTitle">false</item>
|
||||||
|
+ </style>
|
||||||
|
+</resources>
|
||||||
|
\ No newline at end of file
|
Loading…
Reference in a new issue