Commit acf17125 authored by Christoph Thelen's avatar Christoph Thelen

Merge remote-tracking branch 'upstream/master'

parents 5b8bb6f2 f5585232
......@@ -7,8 +7,8 @@ android {
defaultConfig {
applicationId "com.google.android.stardroid"
minSdkVersion 15
targetSdkVersion 24
versionCode 1490
targetSdkVersion 26
versionCode 1491
versionName "1.9.3"
buildConfigField 'String', 'GOOGLE_ANALYTICS_CODE', '""'
}
......@@ -59,9 +59,9 @@ android {
}
// uses only open source software
fdroid {
resValue "string", "analytics_enabled", "false"
}
//fdroid {
// resValue "string", "analytics_enabled", "false"
//}
}
}
......
......@@ -48,7 +48,7 @@
android:name=".StardroidApplication"
android:icon="@drawable/skymap_logo"
android:label="@string/app_name"
android:theme="@android:style/Theme.Holo">
android:theme="@style/AppTheme">
<activity
android:name=".activities.SplashScreenActivity"
android:label="@string/app_name"
......@@ -56,7 +56,6 @@
android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
......@@ -69,7 +68,6 @@
android:theme="@style/FullscreenTheme">
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
......@@ -78,15 +76,12 @@
android:resource="@xml/searchable"/>
</activity>
<activity
android:name=".activities.EditSettingsActivity"
android:theme="@android:style/Theme.Holo"/>
android:name=".activities.EditSettingsActivity"/>
<activity
android:name=".activities.ImageGalleryActivity"
android:theme="@android:style/Theme.Holo"/>
android:name=".activities.ImageGalleryActivity"/>
<activity
android:name=".activities.ImageDisplayActivity"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Holo"/>
android:screenOrientation="portrait"/>
<activity
android:name=".activities.DiagnosticActivity"
android:label="@string/title_activity_diagnostic">
......
......@@ -6,5 +6,4 @@
<color name="low_accuracy">#ffff6900</color>
<color name="bad_sensor">#ffff0000</color>
<color name="absent_sensor">#ffa0a0a0</color>
</resources>
<resources>
<style name="title" parent="text">
<item name="android:textStyle">bold</item>
</style>
<style name="text">
<item name="android:paddingLeft">5px</item>
<!-- Main App Theme to make global changes easier -->
<style name = "AppTheme" parent="@android:style/Theme.Holo">
</style>
<style name="FullscreenTheme" parent="@android:style/Theme.Holo">
<style name="FullscreenTheme" parent="AppTheme">
<item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowBackground">@null</item>
......@@ -41,4 +36,12 @@
<item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item>
</style>
<style name="title" parent="text">
<item name="android:textStyle">bold</item>
</style>
<style name="text">
<item name="android:paddingLeft">5px</item>
</style>
</resources>
......@@ -19,4 +19,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx2048M
org.gradle.configureondemand=false
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment