Remove unused resources and merge resource folders

res/layout-v14/wizard_cancel.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/cancel"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/cancel_action" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-    </LinearLayout>
-
-</merge>

res/layout-v14/wizard_done.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/done"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/done_action" />
-    </LinearLayout>
-
-</merge>

res/layout-v14/wizard_next.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/next_action" />
-    </LinearLayout>
-
-</merge>

res/layout-v14/wizard_setup.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/manual_setup"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/account_setup_basics_manual_setup_action" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/next_action" />
-    </LinearLayout>
-
-</merge>

res/layout-v14/wizard_welcome.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/import_settings"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/settings_import" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/next_action" />
-    </LinearLayout>
-
-</merge>

res/layout/wizard_cancel.xml

@@ -1,18 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
     <LinearLayout
-        android:layout_width="fill_parent"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
+        android:orientation="horizontal" >
-        android:gravity="bottom|left" >
 
         <Button
             android:id="@+id/cancel"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/cancel_action" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
     </LinearLayout>
 
 </merge>

res/layout/wizard_done.xml

@@ -1,18 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
     <LinearLayout
-        android:layout_width="fill_parent"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
+        android:orientation="horizontal" >
-        android:gravity="bottom|right" >
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/done"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
+            android:layout_weight="1"
-            android:minWidth="@dimen/button_minWidth"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/done_action" />
     </LinearLayout>
 

res/layout/wizard_next.xml

@@ -1,18 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
     <LinearLayout
-        android:layout_width="fill_parent"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
+        android:orientation="horizontal" >
-        android:gravity="bottom|right" >
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/next"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
+            android:layout_weight="1"
-            android:minWidth="@dimen/button_minWidth"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/next_action" />
     </LinearLayout>
 

res/layout/wizard_setup.xml

@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <RelativeLayout
+    <View
-        android:layout_width="fill_parent"
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
+        android:orientation="horizontal" >
-        android:gravity="bottom|right" >
 
         <Button
             android:id="@+id/manual_setup"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
+            android:layout_weight="1"
-            android:minWidth="@dimen/button_minWidth"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/account_setup_basics_manual_setup_action" />
 
         <Button
             android:id="@+id/next"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_weight="1"
-            android:drawableRight="@drawable/button_indicator_next"
+            android:background="@drawable/selectable_item_background"
-            android:minWidth="@dimen/button_minWidth"
             android:text="@string/next_action" />
-    </RelativeLayout>
+    </LinearLayout>
 
 </merge>

res/layout/wizard_welcome.xml

@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <RelativeLayout
+    <View
-        android:layout_width="fill_parent"
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
+        android:orientation="horizontal" >
-        android:gravity="bottom|right" >
 
         <Button
             android:id="@+id/import_settings"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
+            android:layout_weight="1"
-            android:minWidth="@dimen/button_minWidth"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/settings_import" />
 
         <Button
             android:id="@+id/next"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_weight="1"
-            android:drawableRight="@drawable/button_indicator_next"
+            android:background="@drawable/selectable_item_background"
-            android:minWidth="@dimen/button_minWidth"
             android:text="@string/next_action" />
-    </RelativeLayout>
+    </LinearLayout>
 
 </merge>

res/values-v11/styles.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textColor">#cccccc</item>
-    </style>
-
-    <style name="UnreadWidgetContainer">
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:background">@null</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="UnreadWidgetTextView">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDy">1</item>
-        <item name="android:shadowRadius">4.0</item>
-    </style>
-
-</resources>

res/values-v11/themes.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="Theme.K9.Startup" parent="Theme.K9.Dark" />
-
-    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
-        <item name="composerBackgroundColor">@android:color/background_dark</item>
-        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
-        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
-    </style>
-
-    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
-        <item name="composerBackgroundColor">@android:color/background_light</item>
-        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
-        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
-    </style>
-
-    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
-        <item name="backgroundColorChooseAccountHeader">#404040</item>
-    </style>
-
-</resources>

res/values-v14/themes.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="Theme.K9.Startup" parent="@android:style/Theme.Holo.NoActionBar">
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
-</resources>

res/values/styles.xml

@@ -19,24 +19,24 @@
     </style>
 
     <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#cccccc</item>
     </style>
 
     <style name="UnreadWidgetContainer">
-        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingLeft">2dp</item>
+        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">2dp</item>
+        <item name="android:paddingRight">0dp</item>
-        <item name="android:paddingBottom">8.5dp</item>
+        <item name="android:paddingBottom">0dp</item>
-        <item name="android:background">@drawable/unread_widget_background</item>
+        <item name="android:background">@null</item>
-        <item name="android:gravity">bottom|center_horizontal</item>
+        <item name="android:gravity">center</item>
     </style>
 
     <style name="UnreadWidgetTextView">
-        <item name="android:textSize" tools:ignore="SpUsage">13dp</item>
+        <item name="android:textSize">12sp</item>
-        <item name="android:background">@drawable/rounded_corners</item>
         <item name="android:textColor">#ffffff</item>
         <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowRadius">2.0</item>
+        <item name="android:shadowDy">1</item>
+        <item name="android:shadowRadius">4.0</item>
     </style>
 
 </resources>

res/values/themes.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme.K9.Startup" parent="Theme.K9.Dark" />
+    <style name="Theme.K9.Startup" parent="@android:style/Theme.Holo.NoActionBar">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
 
     <style name="Theme.K9.Light.Base" parent="@android:style/Theme.Holo.Light">
         <item name="iconFolder">@drawable/folder_light</item>
@@ -108,24 +110,24 @@
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
-        <item name="composerBackgroundColor">@android:color/white</item>
+        <item name="composerBackgroundColor">@android:color/background_light</item>
+        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
+        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
     </style>
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
-        <item name="android:windowBackground">@android:color/black</item>
+        <item name="composerBackgroundColor">@android:color/background_dark</item>
-        <item name="composerBackgroundColor">@android:color/black</item>
+        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
-        <!-- Work around some oddities -->
+        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
-        <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
-        <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
-        <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
     </style>
 
     <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">
         <item name="backgroundColorChooseAccountHeader">#cccccc</item>
     </style>
 
-    <!-- Prior to Honeycomb we always use the light theme for dialogs -->
+    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
-    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dialog.Light" />
+        <item name="backgroundColorChooseAccountHeader">#404040</item>
+    </style>
 
     <style name="Theme.K9.Dialog.Translucent.Dark" parent="@android:style/Theme.Holo.Dialog">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -144,4 +146,5 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
     </style>
+
 </resources>