Merge branch 'firstReleseToMaster' of s416084/find-my-tutor-android into develop
This commit is contained in:
commit
d1a249e5cf
@ -11,7 +11,7 @@ android {
|
|||||||
minSdkVersion 22
|
minSdkVersion 22
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "0.9.0-alpha"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
}
|
}
|
||||||
|
BIN
app/release/release/app.aab
Normal file
BIN
app/release/release/app.aab
Normal file
Binary file not shown.
@ -37,7 +37,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.MapActivity"
|
android:name=".activity.MapActivity"
|
||||||
android:label="@string/title_activity_main"
|
android:label="@string/map_activity_label"
|
||||||
android:launchMode="singleTop" />
|
android:launchMode="singleTop" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.LoginActivity"
|
android:name=".activity.LoginActivity"
|
||||||
@ -50,10 +50,6 @@
|
|||||||
android:name=".activity.SettingsActivity"
|
android:name=".activity.SettingsActivity"
|
||||||
android:label="@string/title_activity_settings" />
|
android:label="@string/title_activity_settings" />
|
||||||
|
|
||||||
<activity
|
|
||||||
android:name=".service.GoogleLocalizationActivity"
|
|
||||||
android:label="@string/title_activity_settings" />
|
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".service.BackgroundLocalizationService"
|
android:name=".service.BackgroundLocalizationService"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
|
@ -194,5 +194,6 @@
|
|||||||
<string name="permission_rationale">permission should be granted</string>
|
<string name="permission_rationale">permission should be granted</string>
|
||||||
<string name="launch_activity" />
|
<string name="launch_activity" />
|
||||||
<string name="remove_location_updates" />
|
<string name="remove_location_updates" />
|
||||||
|
<string name="map_activity_label">MapActivity</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
Reference in New Issue
Block a user