remove useless changes

OsmAnd/res/layout/preference_category_summary.xml

@@ -7,8 +7,8 @@
 		style="?android:attr/listSeparatorTextViewStyle"/>
 	
 	<TextView android:id="@android:id/summary"
-		android:paddingLeft="8dip" android:paddingRight="10dip"
+		android:paddingLeft="@dimen/content_padding_half" android:paddingRight="@dimen/content_padding_half"
-		android:textColor="#000000"
+		android:textColor="?android:textColorPrimary"
 		android:layout_width="match_parent" android:layout_height="wrap_content"/>
 	
 </LinearLayout>

OsmAnd/res/values/strings.xml

@@ -11,10 +11,10 @@
 	Thx - Hardy
 
 -->
-	<string name="wake_on_voice_time">Time</string>
+    <string name="wake_on_voice_time">Time</string>
-	<string name="wake_on_voice_time_descr">Set the time for which the screen will turn on.</string>
+    <string name="wake_on_voice_time_descr">Set the time for which the screen will turn on.</string>
-	<string name="wake_on_voice_sensor">Use proximity sensor</string>
+    <string name="wake_on_voice_sensor">Use proximity sensor</string>
-	<string name="wake_on_voice_sensor_descr">Wave your hand over the top of the screen to turn on the screen while navigating.</string>
+    <string name="wake_on_voice_sensor_descr">Wave your hand over the top of the screen to turn on the screen while navigating.</string>
     <string name="app_profile_custom_nav_subtitle"></string>
     <string name="rate_dialog_descr">Please give us 30 seconds, share feedback and rate our work on Google Play.</string>
     <string name="button_rate">Rate</string>

OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java

@@ -2262,16 +2262,16 @@ public class OsmandAidlApi {
 
 	public interface SearchCompleteCallback {
 		void onSearchComplete(List<SearchResult> resultSet);
-
 	}
+	
 	public interface GpxBitmapCreatedCallback {
 		void onGpxBitmapCreatedComplete(AGpxBitmap aGpxBitmap);
-
 	}
+	
 	public interface OsmandAppInitCallback {
 		void onAppInitialized();
-
 	}
+	
 	public interface AMapPointUpdateListener {
 		void onAMapPointUpdated(AMapPoint point, String layerId);
 

OsmAnd/src/net/osmand/plus/AppInitializer.java

@@ -498,8 +498,9 @@ public class AppInitializer implements IProgress {
 			app.travelDbHelper.initTravelBooks();
 		}
 		app.travelDbHelper = startupInit(app.travelDbHelper, TravelDbHelper.class);
-		app.lockHelper = startupInit(new LockHelper(app), LockHelper.class);
 
+		app.lockHelper = startupInit(new LockHelper(app), LockHelper.class);
+		
 		initOpeningHoursParser();
 	}
 

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -88,6 +88,7 @@ import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.dialogs.CrashBottomSheetDialogFragment;
 import net.osmand.plus.dialogs.RateUsBottomSheetDialogFragment;
 import net.osmand.plus.dialogs.SendAnalyticsBottomSheetDialogFragment;
+import net.osmand.plus.dialogs.RateUsBottomSheetDialog;
 import net.osmand.plus.dialogs.WhatsNewDialogFragment;
 import net.osmand.plus.dialogs.XMasDialogFragment;
 import net.osmand.plus.download.DownloadActivity;

OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java

@@ -3,6 +3,7 @@ package net.osmand.plus.activities;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnMultiChoiceClickListener;
 import android.content.Intent;
 import android.media.AudioManager;
@@ -16,14 +17,19 @@ import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.util.TypedValue;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.SeekBar;
+import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
+import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.AutoZoomMap;
@@ -38,6 +44,7 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.router.GeneralRouter;
+import net.osmand.router.GeneralRouter.GeneralRouterProfile;
 import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.router.GeneralRouter.RoutingParameterType;
 import net.osmand.util.Algorithms;
@@ -118,7 +125,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		registerListPreference(settings.SPEED_SYSTEM, screen, speedNamesVls, speedValues);
         
 //         registerBooleanPreference(settings.SHOW_ZOOM_BUTTONS_NAVIGATION, screen);
-
+		
 		showAlarms = (Preference) screen.findPreference("show_routing_alarms");
 		showAlarms.setOnPreferenceClickListener(this);
 		

OsmAnd/src/net/osmand/plus/profiles/SettingsProfileFragment.java

@@ -38,6 +38,7 @@ public class SettingsProfileFragment extends BaseOsmAndFragment {
 	public static final String IS_NEW_PROFILE = "new_profile";
 	public static final String IS_USER_PROFILE = "user_profile";
 
+
 	private ProfileMenuAdapter adapter;
 	private RecyclerView recyclerView;
 	private LinearLayout addNewProfileBtn;

gradle.properties

@@ -18,4 +18,4 @@
 # for enableD8=true min sdk must be > 22
 # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
 # UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23)
-android.enableD8=false
+android.enableD8=false 

settings.gradle

@@ -3,4 +3,4 @@ include ':OsmAnd'
 include ':plugins:Osmand-Nautical'
 include ':plugins:Osmand-ParkingPlugin'
 include ':plugins:Osmand-SRTMPlugin'
-include ':plugins:Osmand-Skimaps'
+include ':plugins:Osmand-Skimaps'