diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..513b456
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 76a4349..7ac24c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,12 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4872587..e0d5b93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2553f43..06a8215 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,10 +16,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ buildToolsVersion '27.0.3'
}
dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
diff --git a/app/src/main/java/ru/volgorobot/vrcatalog/SettingsActivity.java b/app/src/main/java/ru/volgorobot/vrcatalog/SettingsActivity.java
index 65f08c0..928ab76 100644
--- a/app/src/main/java/ru/volgorobot/vrcatalog/SettingsActivity.java
+++ b/app/src/main/java/ru/volgorobot/vrcatalog/SettingsActivity.java
@@ -2,19 +2,22 @@ package ru.volgorobot.vrcatalog;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.support.v7.app.AppCompatDelegate;
import android.view.Menu;
import android.view.MenuItem;
import android.preference.PreferenceActivity;
public class SettingsActivity extends PreferenceActivity {
+ private AppCompatDelegate mDelegate;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.activity_settings);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- getSupportActionBar().setHomeButtonEnabled(true);
+ //getActionBar().setDisplayHomeAsUpEnabled(true);
+ //getActionBar().setHomeButtonEnabled(true);
}
@Override
@@ -32,4 +35,6 @@ public class SettingsActivity extends PreferenceActivity {
}
return super.onOptionsItemSelected(item);
}
+
+
}