Check size of assets to conform Android design guidelines (issues #12

and #15)

diff --git a/res/drawable-hdpi/ic_holo_light_config.png b/res/drawable-hdpi/ic_holo_light_config.png
index dbbd116..366a8b7 100644 (file)
Binary files a/res/drawable-hdpi/ic_holo_light_config.png and b/res/drawable-hdpi/ic_holo_light_config.png differ

diff --git a/res/drawable-hdpi/ic_holo_light_next.png b/res/drawable-hdpi/ic_holo_light_next.png
new file mode 100644 (file)
index 0000000..e6495b2
Binary files /dev/null and b/res/drawable-hdpi/ic_holo_light_next.png differ

diff --git a/res/drawable-hdpi/ic_holo_light_previous.png b/res/drawable-hdpi/ic_holo_light_previous.png
new file mode 100644 (file)
index 0000000..23778ae
Binary files /dev/null and b/res/drawable-hdpi/ic_holo_light_previous.png differ

diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
index c9344fb..1fc8770 100644 (file)
Binary files a/res/drawable-hdpi/ic_launcher_settings.png and b/res/drawable-hdpi/ic_launcher_settings.png differ

diff --git a/res/drawable-mdpi/ic_holo_light_config.png b/res/drawable-mdpi/ic_holo_light_config.png
index 91e0931..50b3e0c 100644 (file)
Binary files a/res/drawable-mdpi/ic_holo_light_config.png and b/res/drawable-mdpi/ic_holo_light_config.png differ

diff --git a/res/drawable-mdpi/ic_holo_light_next.png b/res/drawable-mdpi/ic_holo_light_next.png
new file mode 100644 (file)
index 0000000..88029a8
Binary files /dev/null and b/res/drawable-mdpi/ic_holo_light_next.png differ

diff --git a/res/drawable-mdpi/ic_holo_light_previous.png b/res/drawable-mdpi/ic_holo_light_previous.png
new file mode 100644 (file)
index 0000000..8d19e39
Binary files /dev/null and b/res/drawable-mdpi/ic_holo_light_previous.png differ

diff --git a/res/drawable-xhdpi/ic_holo_light_config.png b/res/drawable-xhdpi/ic_holo_light_config.png
index aa3d124..f8a65a0 100644 (file)
Binary files a/res/drawable-xhdpi/ic_holo_light_config.png and b/res/drawable-xhdpi/ic_holo_light_config.png differ

diff --git a/res/drawable-xhdpi/ic_holo_light_next.png b/res/drawable-xhdpi/ic_holo_light_next.png
new file mode 100644 (file)
index 0000000..c36e050
Binary files /dev/null and b/res/drawable-xhdpi/ic_holo_light_next.png differ

diff --git a/res/drawable-xhdpi/ic_holo_light_previous.png b/res/drawable-xhdpi/ic_holo_light_previous.png
new file mode 100644 (file)
index 0000000..cf0b485
Binary files /dev/null and b/res/drawable-xhdpi/ic_holo_light_previous.png differ

diff --git a/res/layout/navigation_view_customtitle_breadcrumb.xml b/res/layout/navigation_view_customtitle_breadcrumb.xml
index ce32f4a..979935c 100644 (file)
--- a/res/layout/navigation_view_customtitle_breadcrumb.xml
+++ b/res/layout/navigation_view_customtitle_breadcrumb.xml
@@ -24,9 +24,9 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_alignParentRight="true"
-    android:contentDescription="@string/actionbar_button_configuration_cd"
+    android:contentDescription="@null"
     android:onClick="onActionBarItemClick"
-    android:src="@drawable/ic_holo_light_config" />
+    android:src="@drawable/ic_holo_light_previous" />
 
   <com.cyanogenmod.explorer.ui.widgets.BreadcrumbView
     android:id="@+id/breadcrumb_view"

diff --git a/res/layout/navigation_view_customtitle_configuration.xml b/res/layout/navigation_view_customtitle_configuration.xml
index b6c6bf9..9e5e3a9 100644 (file)
--- a/res/layout/navigation_view_customtitle_configuration.xml
+++ b/res/layout/navigation_view_customtitle_configuration.xml
@@ -57,8 +57,8 @@
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
     android:layout_alignParentRight="true"
-    android:contentDescription="@string/actionbar_button_nav_close_cd"
+    android:contentDescription="@null"
     android:onClick="onActionBarItemClick"
-    android:src="@drawable/ic_holo_light_close" />
+    android:src="@drawable/ic_holo_light_next" />
 
 </RelativeLayout>
\ No newline at end of file

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e3a54b5..309d0e6 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -155,16 +155,12 @@
 
   <!-- ActionBar Buttons * FileSystem -->
   <string name="actionbar_button_filesystem_cd">File system info</string>
-  <!-- ActionBar Buttons * Navigation View Configuration -->
-  <string name="actionbar_button_configuration_cd">Configuration</string>
   <!-- ActionBar Buttons * Sort Mode -->
   <string name="actionbar_button_sort_mode_cd">Sort mode</string>
   <!-- ActionBar Buttons * Layout Mode -->
   <string name="actionbar_button_layout_mode_cd">Layout mode</string>
   <!-- ActionBar Buttons * Other View Options -->
   <string name="actionbar_button_other_view_options_cd">Other view options</string>
-  <!-- ActionBar Buttons * Close -->
-  <string name="actionbar_button_nav_close_cd">Close</string>
   <!-- ActionBar Buttons * Done -->
   <string name="actionbar_button_selection_done_cd">Done</string>
   <!-- ActionBar Buttons * Actions -->

diff --git a/src/com/cyanogenmod/explorer/activities/SearchActivity.java b/src/com/cyanogenmod/explorer/activities/SearchActivity.java
index 56e66f3..75dd3b8 100644 (file)
--- a/src/com/cyanogenmod/explorer/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/explorer/activities/SearchActivity.java
@@ -367,7 +367,6 @@ public class SearchActivity extends Activity
         title.setContentDescription(getString(R.string.search));
         ButtonItem configuration = (ButtonItem)customTitle.findViewById(R.id.ab_button1);
         configuration.setImageResource(R.drawable.ic_holo_light_config);
-        configuration.setContentDescription(getString(R.string.actionbar_button_configuration_cd));
         configuration.setVisibility(View.VISIBLE);
 
         getActionBar().setCustomView(customTitle);