Commit acf17125 authored by Christoph Thelen's avatar Christoph Thelen

Merge remote-tracking branch 'upstream/master'

parents 5b8bb6f2 f5585232
...@@ -7,8 +7,8 @@ android { ...@@ -7,8 +7,8 @@ android {
defaultConfig { defaultConfig {
applicationId "com.google.android.stardroid" applicationId "com.google.android.stardroid"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 24 targetSdkVersion 26
versionCode 1490 versionCode 1491
versionName "1.9.3" versionName "1.9.3"
buildConfigField 'String', 'GOOGLE_ANALYTICS_CODE', '""' buildConfigField 'String', 'GOOGLE_ANALYTICS_CODE', '""'
} }
...@@ -59,9 +59,9 @@ android { ...@@ -59,9 +59,9 @@ android {
} }
// uses only open source software // uses only open source software
fdroid { //fdroid {
resValue "string", "analytics_enabled", "false" // resValue "string", "analytics_enabled", "false"
} //}
} }
} }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
android:name=".StardroidApplication" android:name=".StardroidApplication"
android:icon="@drawable/skymap_logo" android:icon="@drawable/skymap_logo"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.Holo"> android:theme="@style/AppTheme">
<activity <activity
android:name=".activities.SplashScreenActivity" android:name=".activities.SplashScreenActivity"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen"> android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
...@@ -69,7 +68,6 @@ ...@@ -69,7 +68,6 @@
android:theme="@style/FullscreenTheme"> android:theme="@style/FullscreenTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEARCH"/> <action android:name="android.intent.action.SEARCH"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
...@@ -78,15 +76,12 @@ ...@@ -78,15 +76,12 @@
android:resource="@xml/searchable"/> android:resource="@xml/searchable"/>
</activity> </activity>
<activity <activity
android:name=".activities.EditSettingsActivity" android:name=".activities.EditSettingsActivity"/>
android:theme="@android:style/Theme.Holo"/>
<activity <activity
android:name=".activities.ImageGalleryActivity" android:name=".activities.ImageGalleryActivity"/>
android:theme="@android:style/Theme.Holo"/>
<activity <activity
android:name=".activities.ImageDisplayActivity" android:name=".activities.ImageDisplayActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"/>
android:theme="@android:style/Theme.Holo"/>
<activity <activity
android:name=".activities.DiagnosticActivity" android:name=".activities.DiagnosticActivity"
android:label="@string/title_activity_diagnostic"> android:label="@string/title_activity_diagnostic">
......
...@@ -6,5 +6,4 @@ ...@@ -6,5 +6,4 @@
<color name="low_accuracy">#ffff6900</color> <color name="low_accuracy">#ffff6900</color>
<color name="bad_sensor">#ffff0000</color> <color name="bad_sensor">#ffff0000</color>
<color name="absent_sensor">#ffa0a0a0</color> <color name="absent_sensor">#ffa0a0a0</color>
</resources> </resources>
<resources> <resources>
<!-- Main App Theme to make global changes easier -->
<style name="title" parent="text"> <style name = "AppTheme" parent="@android:style/Theme.Holo">
<item name="android:textStyle">bold</item>
</style>
<style name="text">
<item name="android:paddingLeft">5px</item>
</style> </style>
<style name="FullscreenTheme" parent="@android:style/Theme.Holo"> <style name="FullscreenTheme" parent="AppTheme">
<item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item> <item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
<item name="android:windowActionBarOverlay">true</item> <item name="android:windowActionBarOverlay">true</item>
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
...@@ -41,4 +36,12 @@ ...@@ -41,4 +36,12 @@
<item name="android:paddingTop">5dp</item> <item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item> <item name="android:paddingBottom">5dp</item>
</style> </style>
<style name="title" parent="text">
<item name="android:textStyle">bold</item>
</style>
<style name="text">
<item name="android:paddingLeft">5px</item>
</style>
</resources> </resources>
...@@ -19,4 +19,3 @@ ...@@ -19,4 +19,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xmx2048M 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