fix order

This commit is contained in:
Alexey Kuznetsov 2017-02-23 20:02:50 +03:00
commit 5da130e11b
5 changed files with 9 additions and 11 deletions

View file

@ -43,12 +43,12 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:support-v4:25.1.1'
compile 'com.android.support:design:25.1.1'
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:support-v4:25.2.0'
compile 'com.android.support:design:25.2.0'
compile 'com.google.android.gms:play-services-appindexing:9.8.0'
compile 'org.apache.commons:commons-math3:3.6.1'
compile 'com.github.axet:android-library:1.9.7' //compile project(':android-library')
compile 'com.github.axet:android-library:1.9.9' //compile project(':android-library')
compile 'com.github.axet:jebml:0.0.2' // compile project(':jebml')
compile 'com.github.axet:vorbis:1.0.0' // compile project(':vorbis')
}

View file

@ -23,7 +23,7 @@
<activity
android:name=".activities.MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_main"
android:label="@string/app_name"
android:launchMode="singleInstance"
android:theme="@style/AppThemeLight.NoActionBar">
<intent-filter>

View file

@ -2,14 +2,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activities.MainActivity">
<item
android:id="@+id/action_show_folder"
android:orderInCategory="100"
android:title="@string/open_recording_folder"
app:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
<item
android:id="@+id/action_show_folder"
android:orderInCategory="100"
android:title="@string/open_recording_folder"
app:showAsAction="never" />
</menu>

View file

@ -25,7 +25,6 @@
<item>Стерео</item>
</string-array>
<string name="title_activity_main">Аудио Рекордер</string>
<string name="action_settings">Настройки</string>
<string name="not_permitted">Доступ запрещен</string>
<string name="no_folder_app">Программа для просмотра папок не установлена</string>

View file

@ -49,7 +49,6 @@
<item>2</item>
</string-array>
<string name="title_activity_main">Audio Recorder</string>
<string name="action_settings">Settings</string>
<string name="not_permitted">Not permitted</string>
<string name="no_folder_app">No folder view application installed</string>