diff options
author | Leith Bade <leith@mapbox.com> | 2015-08-19 11:07:16 +1000 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-08-19 13:03:20 +1000 |
commit | 4dd16a7e7f76321a611c0ab5e498b18e5b4f8ebc (patch) | |
tree | 8f65e32ceb9ee51dc376e087810c9363b9c0ec87 | |
parent | bfd17e2d27498f48a6e981f5b596c82d04cbc6bb (diff) | |
download | qtlocation-mapboxgl-4dd16a7e7f76321a611c0ab5e498b18e5b4f8ebc.tar.gz |
Add missing Andorid support design library dependency
Fix various warning
4 files changed, 6 insertions, 4 deletions
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 0a9b19bc95..72dfdaa0c7 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -85,6 +85,7 @@ dependencies { compile 'com.android.support:support-annotations:23.0.0' compile 'com.android.support:support-v4:23.0.0' compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.android.support:design:23.0.0' compile('com.crashlytics.sdk.android:crashlytics:2.5.1@aar') { transitive = true; } diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index a5f7c32362..85be72bb70 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -3,11 +3,11 @@ package="com.mapbox.mapboxgl.testapp"> <application - android:allowBackup="false" + android:allowBackup="true" + android:fullBackupContent="true" android:icon="@drawable/icon_burned" android:label="@string/app_name" android:theme="@style/AppTheme" - tools:ignore="UnusedAttribute" android:supportsRtl="true"> <activity android:name="com.mapbox.mapboxgl.testapp.MainActivity" diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index 3d7538977b..a4358c773c 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -6,6 +6,7 @@ import android.graphics.Color; import android.graphics.PointF; import android.location.Location; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.NavigationView; import android.support.v4.app.ActivityCompat; @@ -236,7 +237,7 @@ public class MainActivity extends AppCompatActivity { } @Override - public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) { switch (requestCode) { case PERMISSIONS_LOCATION: { if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index e81ddae4c2..292f77c3a4 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -16,7 +16,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorPrimary" + android:background="@color/primary" android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> |