Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-01 18:05:40 +02:00
commit 0dcb566bb3
2 changed files with 32 additions and 33 deletions

View file

@ -161,7 +161,7 @@
<item name="android:textColorPrimary">@color/color_white</item> <item name="android:textColorPrimary">@color/color_white</item>
<item name="spinnerItemTextColor">@color/color_white</item> <item name="spinnerItemTextColor">@color/color_white</item>
<item name="spinnerListBackground">@color/spinner_list_background_dark</item> <item name="spinnerListBackground">@color/spinner_list_background_dark</item>
<item name="colorButtonNormal">@color/color_white</item> <item name="colorButtonNormal">@color/bg_color_dark</item>
<item name="android:actionModeBackground">@color/actionbar_dark_color</item> <item name="android:actionModeBackground">@color/actionbar_dark_color</item>
<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item> <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>

View file

@ -1,10 +1,30 @@
package net.osmand.plus.audionotes; package net.osmand.plus.audionotes;
import java.io.File; import android.content.Context;
import java.io.IOException; import android.content.DialogInterface;
import java.util.ArrayList; import android.content.Intent;
import java.util.Iterator; import android.graphics.drawable.Drawable;
import java.util.List; import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.FileProvider;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.view.ActionMode;
import android.support.v7.widget.PopupMenu;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.Toast;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.GPXUtilities; import net.osmand.plus.GPXUtilities;
@ -23,33 +43,12 @@ import net.osmand.plus.dialogs.DirectionsDialogs;
import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import android.app.AlertDialog;
import android.content.Context; import java.io.File;
import android.content.DialogInterface; import java.io.IOException;
import android.content.Intent; import java.util.ArrayList;
import android.graphics.PorterDuff.Mode; import java.util.Iterator;
import android.graphics.drawable.Drawable; import java.util.List;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.FileProvider;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.view.ActionMode;
import android.support.v7.widget.PopupMenu;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
/** /**
* Created by Denis on 18.02.2015. * Created by Denis on 18.02.2015.