From a1ac0c03f4560dc090c400de97e842397f33df3f Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Sun, 1 Jan 2012 16:49:44 +0300
Subject: [PATCH] Fixed new country status support for downloader - "Generating
 search index"

---
 .../res/layout/country_download_failed.xml    |  3 +-
 android/res/layout/country_downloading.xml    |  3 +-
 .../country_generating_search_index.xml       | 45 +++++++++++++++++++
 android/res/layout/country_in_the_queue.xml   |  3 +-
 android/res/layout/country_not_downloaded.xml |  3 +-
 android/res/layout/country_on_disk.xml        |  3 +-
 .../src/com/mapswithme/maps/DownloadUI.java   |  3 ++
 storage/storage.hpp                           |  4 +-
 8 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 android/res/layout/country_generating_search_index.xml

diff --git a/android/res/layout/country_download_failed.xml b/android/res/layout/country_download_failed.xml
index eec3ac4486..411b10000e 100644
--- a/android/res/layout/country_download_failed.xml
+++ b/android/res/layout/country_download_failed.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:baselineAligned="false"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -7,7 +8,7 @@
     android:paddingRight="?android:attr/scrollbarSize">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:layout_marginRight="6dip"
diff --git a/android/res/layout/country_downloading.xml b/android/res/layout/country_downloading.xml
index e3ac5d74d3..0079c381ff 100644
--- a/android/res/layout/country_downloading.xml
+++ b/android/res/layout/country_downloading.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:baselineAligned="false"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -7,7 +8,7 @@
     android:paddingRight="?android:attr/scrollbarSize">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:layout_marginRight="6dip"
diff --git a/android/res/layout/country_generating_search_index.xml b/android/res/layout/country_generating_search_index.xml
new file mode 100644
index 0000000000..0079c381ff
--- /dev/null
+++ b/android/res/layout/country_generating_search_index.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:baselineAligned="false"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textColor="#342BB6" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/android/res/layout/country_in_the_queue.xml b/android/res/layout/country_in_the_queue.xml
index bad596db30..3609c37aa6 100644
--- a/android/res/layout/country_in_the_queue.xml
+++ b/android/res/layout/country_in_the_queue.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:baselineAligned="false"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -7,7 +8,7 @@
     android:paddingRight="?android:attr/scrollbarSize">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:layout_marginRight="6dip"
diff --git a/android/res/layout/country_not_downloaded.xml b/android/res/layout/country_not_downloaded.xml
index 172ffc87ab..9f60149c3d 100644
--- a/android/res/layout/country_not_downloaded.xml
+++ b/android/res/layout/country_not_downloaded.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:baselineAligned="false"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -7,7 +8,7 @@
     android:paddingRight="?android:attr/scrollbarSize">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:layout_marginRight="6dip"
diff --git a/android/res/layout/country_on_disk.xml b/android/res/layout/country_on_disk.xml
index f7e15183c5..a1a2d39525 100644
--- a/android/res/layout/country_on_disk.xml
+++ b/android/res/layout/country_on_disk.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:baselineAligned="false"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -7,7 +8,7 @@
     android:paddingRight="?android:attr/scrollbarSize">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:layout_marginRight="6dip"
diff --git a/android/src/com/mapswithme/maps/DownloadUI.java b/android/src/com/mapswithme/maps/DownloadUI.java
index acd9d7e73e..32619702b4 100644
--- a/android/src/com/mapswithme/maps/DownloadUI.java
+++ b/android/src/com/mapswithme/maps/DownloadUI.java
@@ -95,6 +95,9 @@ public class DownloadUI extends PreferenceActivity
       cell.setSummary("Unknown state :(");
 //      ((CheckBoxPreference)cell).setChecked(false);
       break;
+    case 6: // EGeneratingIndex
+      cell.setSummary("Indexing for search...");
+      cell.setLayoutResource(R.layout.country_generating_search_index);
     }
   }
 
diff --git a/storage/storage.hpp b/storage/storage.hpp
index c4abe1f07b..2a7d9fb05a 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -18,12 +18,12 @@ namespace storage
   enum TStatus
   {
     EOnDisk = 0,
-    EGeneratingIndex,
     ENotDownloaded,
     EDownloadFailed,
     EDownloading,
     EInQueue,
-    EUnknown
+    EUnknown,
+    EGeneratingIndex
   };
 
   struct TIndex