Merge pull request #3345 from yunikkk/crashfix

[android] Fixed crash with orientation change.

android/res/layout/downloader_status.xml

@@ -7,7 +7,7 @@
   android:layout_height="@dimen/downloader_status_size"
   tools:background="#20000FF0">
   <com.mapswithme.maps.widget.WheelProgressView
-    android:id="@+id/progress"
+    android:id="@+id/wheel_downloader_progress"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?clickableBackground"

android/res/layout/fragment_migrate.xml

@@ -66,7 +66,7 @@
         style="@style/MwmWidget.Button.Accent"/>
 
       <com.mapswithme.maps.widget.WheelProgressView
-        android:id="@+id/progress"
+        android:id="@+id/wheel_progress"
         android:layout_width="@dimen/downloader_status_size"
         android:layout_height="@dimen/downloader_status_size"
         android:layout_gravity="center"

android/res/layout/fragment_prefs_copyright.xml

@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
   <com.mapswithme.maps.widget.ObservableWebView
-      android:id="@+id/webview"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:visibility="gone"/>
+    android:id="@+id/webview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"/>
 
   <ProgressBar
-      android:id="@+id/progress"
-      style="@style/Widget.AppCompat.ProgressBar"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"/>
+    android:id="@+id/progress"
+    style="@style/Widget.AppCompat.ProgressBar"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"/>
 
   <include layout="@layout/shadow_top"/>
 </FrameLayout>

android/res/layout/item_missed_map.xml

@@ -11,7 +11,7 @@
   android:paddingLeft="@dimen/margin_base_plus"
   android:paddingRight="@dimen/margin_base_plus">
   <com.mapswithme.maps.widget.WheelProgressView
-    android:id="@+id/progress"
+    android:id="@+id/wheel_progress"
     android:layout_width="@dimen/downloader_status_size"
     android:layout_height="@dimen/downloader_status_size"
     android:layout_centerVertical="true"
@@ -39,7 +39,7 @@
     android:id="@+id/tv__title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_toRightOf="@id/progress"
+    android:layout_toRightOf="@id/wheel_progress"
     android:layout_toLeftOf="@id/tv__size"
     android:layout_centerVertical="true"
     android:layout_alignWithParentIfMissing="true"

android/res/layout/item_missed_map_group.xml

@@ -11,7 +11,7 @@
   android:paddingLeft="@dimen/margin_base_plus"
   android:paddingRight="@dimen/margin_base_plus">
   <com.mapswithme.maps.widget.WheelProgressView
-    android:id="@+id/progress"
+    android:id="@+id/wheel_progress"
     android:layout_width="@dimen/downloader_status_size"
     android:layout_height="@dimen/downloader_status_size"
     android:layout_centerVertical="true"
@@ -40,7 +40,7 @@
     android:id="@+id/tv__title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_toRightOf="@id/progress"
+    android:layout_toRightOf="@id/wheel_progress"
     android:layout_toLeftOf="@id/tv__size"
     android:layout_centerVertical="true"
     android:layout_alignWithParentIfMissing="true"

android/res/layout/onmap_downloader.xml

@@ -58,7 +58,7 @@
         android:visibility="gone"/>
 
       <com.mapswithme.maps.widget.WheelProgressView
-        android:id="@+id/downloader_progress"
+        android:id="@+id/wheel_downloader_progress"
         android:layout_width="@dimen/downloader_status_size"
         android:layout_height="@dimen/downloader_status_size"
         android:layout_gravity="center"

android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java

@@ -23,7 +23,7 @@ public class DownloaderStatusIcon
   {
     mFrame = frame;
     mIcon = (ImageView) mFrame.findViewById(R.id.status);
-    mProgress = (WheelProgressView) mFrame.findViewById(R.id.progress);
+    mProgress = (WheelProgressView) mFrame.findViewById(R.id.wheel_downloader_progress);
   }
 
   public DownloaderStatusIcon setOnIconClickListener(View.OnClickListener listener)

android/src/com/mapswithme/maps/downloader/MigrationFragment.java

@@ -111,7 +111,7 @@ public class MigrationFragment extends BaseMwmFragment
 
     mError = (TextView) view.findViewById(R.id.error);
     mPrepare = (TextView) view.findViewById(R.id.preparation);
-    mProgress = (WheelProgressView) view.findViewById(R.id.progress);
+    mProgress = (WheelProgressView) view.findViewById(R.id.wheel_progress);
     mButtonPrimary = (Button) view.findViewById(R.id.button_primary);
     mButtonSecondary = (Button) view.findViewById(R.id.button_secondary);
 

android/src/com/mapswithme/maps/downloader/OnmapDownloader.java

@@ -177,7 +177,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
     mSize = (TextView)mFrame.findViewById(R.id.downloader_size);
 
     View controls = mFrame.findViewById(R.id.downloader_controls_frame);
-    mProgress = (WheelProgressView) controls.findViewById(R.id.downloader_progress);
+    mProgress = (WheelProgressView) controls.findViewById(R.id.wheel_downloader_progress);
     mButton = (Button) controls.findViewById(R.id.downloader_button);
 
     mProgress.setOnClickListener(new View.OnClickListener()

android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java

@@ -74,7 +74,7 @@ public class RoutingMapsDownloadFragment extends BaseRoutingErrorDialogFragment
     if (frame == null)
       return null;
 
-    WheelProgressView res = (WheelProgressView) frame.findViewById(R.id.progress);
+    WheelProgressView res = (WheelProgressView) frame.findViewById(R.id.wheel_progress);
     return ((res != null && UiUtils.isVisible(res)) ? res : null);
   }
 
@@ -93,7 +93,7 @@ public class RoutingMapsDownloadFragment extends BaseRoutingErrorDialogFragment
   @Override
   void bindGroup(View view)
   {
-    WheelProgressView wheel = (WheelProgressView) view.findViewById(R.id.progress);
+    WheelProgressView wheel = (WheelProgressView) view.findViewById(R.id.wheel_progress);
     UiUtils.show(wheel);
     updateWheel(wheel);
   }