Rename some resources, fix action bar tab selectors as well.
Change-Id: I48b4f69bd85b9aa0b034f6a7210311598662c163
Before Width: | Height: | Size: 101 B |
Before Width: | Height: | Size: 107 B |
Before Width: | Height: | Size: 103 B |
Before Width: | Height: | Size: 209 B After Width: | Height: | Size: 209 B |
BIN
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.png
Executable file
After Width: | Height: | Size: 101 B |
BIN
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.png
Executable file
After Width: | Height: | Size: 107 B |
BIN
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.png
Executable file
After Width: | Height: | Size: 106 B |
BIN
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.png
Executable file
After Width: | Height: | Size: 103 B |
BIN
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.png
Executable file
After Width: | Height: | Size: 100 B |
BIN
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.png
Executable file
After Width: | Height: | Size: 100 B |
Before Width: | Height: | Size: 101 B |
Before Width: | Height: | Size: 107 B |
Before Width: | Height: | Size: 103 B |
Before Width: | Height: | Size: 97 B |
Before Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 107 B |
Before Width: | Height: | Size: 105 B |
Before Width: | Height: | Size: 111 B |
Before Width: | Height: | Size: 112 B |
Before Width: | Height: | Size: 97 B |
Before Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 107 B |
Before Width: | Height: | Size: 166 B After Width: | Height: | Size: 166 B |
BIN
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.png
Executable file
After Width: | Height: | Size: 97 B |
BIN
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.png
Executable file
After Width: | Height: | Size: 104 B |
BIN
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.png
Executable file
After Width: | Height: | Size: 104 B |
BIN
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.png
Executable file
After Width: | Height: | Size: 107 B |
BIN
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.png
Executable file
After Width: | Height: | Size: 98 B |
BIN
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.png
Executable file
After Width: | Height: | Size: 97 B |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 105 B |
Before Width: | Height: | Size: 111 B |
Before Width: | Height: | Size: 116 B |
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
BIN
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.png
Executable file
After Width: | Height: | Size: 105 B |
BIN
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.png
Executable file
After Width: | Height: | Size: 111 B |
BIN
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.png
Executable file
After Width: | Height: | Size: 111 B |
BIN
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.png
Executable file
After Width: | Height: | Size: 116 B |
BIN
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.png
Executable file
After Width: | Height: | Size: 101 B |
BIN
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.png
Executable file
After Width: | Height: | Size: 101 B |
@@ -1,26 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:state_selected="false"
|
||||
android:state_pressed="false"
|
||||
android:drawable="@drawable/action_bar_tab_unselected"/>
|
||||
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:state_selected="true"
|
||||
android:state_pressed="false"
|
||||
android:drawable="@drawable/action_bar_tab_selected"/>
|
||||
|
||||
<item
|
||||
android:state_selected="false"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/action_bar_tab_selected_pressed"/>
|
||||
|
||||
<item
|
||||
android:state_selected="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/action_bar_tab_selected_pressed"/>
|
||||
|
||||
</selector>
|
61
android/sdremote/res/drawable/bg_action_bar_tab.xml
Normal file
@@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Non focused states -->
|
||||
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:state_selected="false"
|
||||
android:state_pressed="false"
|
||||
android:drawable="@android:color/transparent"/>
|
||||
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:state_selected="true"
|
||||
android:state_pressed="false"
|
||||
android:drawable="@drawable/bg_action_bar_tab_selected"/>
|
||||
|
||||
<!-- Focused states -->
|
||||
|
||||
<item
|
||||
android:state_focused="true"
|
||||
android:state_selected="false"
|
||||
android:state_pressed="false"
|
||||
android:drawable="@drawable/bg_action_bar_tab_unselected_focused"/>
|
||||
|
||||
<item
|
||||
android:state_focused="true"
|
||||
android:state_selected="true"
|
||||
android:state_pressed="false"
|
||||
android:drawable="@drawable/bg_action_bar_tab_selected_focused"/>
|
||||
|
||||
<!-- Pressed -->
|
||||
|
||||
<!-- Non focused states -->
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:state_selected="false"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/bg_action_bar_tab_unselected_pressed"/>
|
||||
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:state_selected="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/bg_action_bar_tab_selected_pressed"/>
|
||||
|
||||
<!-- Focused states -->
|
||||
|
||||
<item
|
||||
android:state_focused="true"
|
||||
android:state_selected="false"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/bg_action_bar_tab_unselected_pressed"/>
|
||||
|
||||
<item
|
||||
android:state_focused="true"
|
||||
android:state_selected="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/bg_action_bar_tab_selected_pressed"/>
|
||||
|
||||
</selector>
|
@@ -3,7 +3,7 @@
|
||||
android:shape="rectangle">
|
||||
|
||||
<size
|
||||
android:width="10000dp"
|
||||
android:width="100000dp"
|
||||
android:height="1dp"/>
|
||||
|
||||
<solid
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<ImageView
|
||||
android:id="@+id/image_slide_preview"
|
||||
android:adjustViewBounds="true"
|
||||
android:background="@drawable/background_grid_slide"
|
||||
android:background="@drawable/bg_grid_slide"
|
||||
android:contentDescription="@string/description_grid_slide"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_width="wrap_content"
|
||||
|
@@ -9,7 +9,7 @@
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_settings"
|
||||
android:title="@string/title_settings"
|
||||
android:title="@string/menu_settings"
|
||||
android:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
|
@@ -2,6 +2,7 @@
|
||||
<resources>
|
||||
|
||||
<color name="background_action_bar">#e46f1f</color>
|
||||
<color name="background_action_bar_tab_indicator">#e6821c</color>
|
||||
<color name="background_action_bar_divider">#55ffffff</color>
|
||||
<color name="background_header">@color/background_action_bar</color>
|
||||
<color name="background_slide_index">#7f000000</color>
|
||||
|
@@ -10,16 +10,16 @@
|
||||
</style>
|
||||
|
||||
<style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
|
||||
<item name="android:background">@drawable/action_bar_background</item>
|
||||
<item name="background">@drawable/action_bar_background</item>
|
||||
<item name="android:background">@drawable/bg_action_bar</item>
|
||||
<item name="background">@drawable/bg_action_bar</item>
|
||||
|
||||
<item name="android:displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
|
||||
<item name="displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.ImpressRemote.ActionBar.Tab" parent="Widget.Sherlock.Light.ActionBar.TabView.Inverse">
|
||||
<item name="android:background">@drawable/action_bar_tab</item>
|
||||
<item name="background">@drawable/action_bar_tab</item>
|
||||
<item name="android:background">@drawable/bg_action_bar_tab</item>
|
||||
<item name="background">@drawable/bg_action_bar_tab</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.ImpressRemote.Computers" parent="Theme.ImpressRemote">
|
||||
|
@@ -28,7 +28,7 @@ public class SlidesGridAdapter extends BaseAdapter {
|
||||
|
||||
public SlidesGridAdapter(Context aContext, SlideShow aSlideShow) {
|
||||
mLayoutInflater = LayoutInflater.from(aContext);
|
||||
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.slide_unknown);
|
||||
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.bg_slide_unknown);
|
||||
|
||||
mSlideShow = aSlideShow;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ public class SlidesGridAdapter extends BaseAdapter {
|
||||
}
|
||||
|
||||
private void setUpUnknownSlidePreview(ViewHolder aSlideViewHolder) {
|
||||
aSlideViewHolder.mSlidePreview.setImageResource(R.drawable.slide_unknown);
|
||||
aSlideViewHolder.mSlidePreview.setImageResource(R.drawable.bg_slide_unknown);
|
||||
}
|
||||
|
||||
private String buildSlideIndex(int aPosition) {
|
||||
|
@@ -29,7 +29,7 @@ public class SlidesPagerAdapter extends PagerAdapter {
|
||||
|
||||
public SlidesPagerAdapter(Context aContext, SlideShow aSlideShow, View.OnClickListener aSlideClickListener) {
|
||||
mLayoutInflater = LayoutInflater.from(aContext);
|
||||
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.slide_unknown);
|
||||
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.bg_slide_unknown);
|
||||
|
||||
mSlideShow = aSlideShow;
|
||||
|
||||
@@ -76,7 +76,7 @@ public class SlidesPagerAdapter extends PagerAdapter {
|
||||
}
|
||||
|
||||
private void setUpUnknownSlidePreview(ImageView aSlideView) {
|
||||
aSlideView.setImageResource(R.drawable.slide_unknown);
|
||||
aSlideView.setImageResource(R.drawable.bg_slide_unknown);
|
||||
}
|
||||
|
||||
@Override
|
||||
|