summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable/filtershow_background.pngbin1863 -> 0 bytes
-rw-r--r--res/drawable/filtershow_background_new.pngbin2902 -> 0 bytes
-rw-r--r--res/drawable/filtershow_tiled_background.xml21
-rw-r--r--res/layout-land/filtershow_activity.xml4
-rw-r--r--res/layout/filtershow_actionbar.xml1
-rw-r--r--res/layout/filtershow_activity.xml4
-rw-r--r--res/values-v21/styles.xml2
-rw-r--r--res/values/filtershow_color.xml16
-rw-r--r--res/values/styles.xml2
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java2
10 files changed, 14 insertions, 38 deletions
diff --git a/res/drawable/filtershow_background.png b/res/drawable/filtershow_background.png
deleted file mode 100644
index 22e1641dd..000000000
--- a/res/drawable/filtershow_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/filtershow_background_new.png b/res/drawable/filtershow_background_new.png
deleted file mode 100644
index a11538944..000000000
--- a/res/drawable/filtershow_background_new.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/filtershow_tiled_background.xml b/res/drawable/filtershow_tiled_background.xml
deleted file mode 100644
index dfc7592d0..000000000
--- a/res/drawable/filtershow_tiled_background.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<bitmap
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/filtershow_background_new"
- android:tileMode="repeat"
- android:dither="false" /> \ No newline at end of file
diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml
index f4380126e..c1c7e0e69 100644
--- a/res/layout-land/filtershow_activity.xml
+++ b/res/layout-land/filtershow_activity.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/mainView"
- android:background="@drawable/filtershow_tiled_background">
+ android:background="@color/filtershow_background">
<LinearLayout
android:layout_width="match_parent"
@@ -35,7 +35,7 @@
<ProgressBar
android:id="@+id/loading"
- style="@android:style/Widget.Holo.ProgressBar.Large"
+ style="@android:style/Widget.Material.ProgressBar.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index 2b77dfcd1..924d7178d 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -17,7 +17,6 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:background="@drawable/filtershow_button_background"
android:id="@+id/filtershow_done"
android:textAllCaps="true"
android:text="@string/save"
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 79c315b7b..e3f4a0eeb 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/mainView"
- android:background="@drawable/filtershow_tiled_background">
+ android:background="@color/filtershow_background">
<LinearLayout
android:layout_width="match_parent"
@@ -33,7 +33,7 @@
<ProgressBar
android:id="@+id/loading"
- style="@android:style/Widget.Holo.ProgressBar.Large"
+ style="@android:style/Widget.Material.ProgressBar.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index ee239a657..d65338f0a 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -37,7 +37,7 @@
<item name="android:actionBarStyle">@style/Material.ActionBar</item>
<item name="android:colorBackground">@null</item>
<item name="android:colorBackgroundCacheHint">@null</item>
- <item name="android:windowBackground">@drawable/filtershow_tiled_background</item>
+ <item name="android:windowBackground">@color/filtershow_background</item>
</style>
<style name="Material.ActionBar" parent="android:Widget.Material.ActionBar">
<item name="android:title"></item>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index 4fb4495e7..9cdec49e2 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -20,29 +20,29 @@
<color name="red">#FF0000</color>
<color name="blue">#0000FF</color>
<color name="text_toolbar">#FFFFFF</color>
- <color name="background_screen">#101010</color>
- <color name="background_toolbar">#363949</color>
- <color name="background_main_toolbar">#232323</color>
+ <color name="background_screen">#ff21272b</color>
+ <color name="background_toolbar">#37474F</color>
+ <color name="background_main_toolbar">#37474F</color>
<color name="toolbar_separation_line">#333333</color>
<color name="slider_dot_color">#646464</color>
<color name="slider_line_color">#888888</color>
- <color name="state_panel_separation_line">#232323</color>
- <color name="filtershow_background">#333333</color>
+ <color name="state_panel_separation_line">#263238</color>
+ <color name="filtershow_background">#ff21272b</color>
<color name="filtershow_graphic">#717171</color>
- <color name="filtershow_stateview_end_background">#232323</color>
+ <color name="filtershow_stateview_end_background">#263238</color>
<color name="filtershow_stateview_end_text">#a7a7a7</color>
<color name="filtershow_stateview_background">#464646</color>
<color name="filtershow_stateview_text">#FFFFFF</color>
<color name="filtershow_stateview_selected_background">#c8c8c8</color>
<color name="filtershow_stateview_selected_text">#000000</color>
- <color name="filtershow_categoryview_background">#1a1a1a</color>
+ <color name="filtershow_categoryview_background">#ff21272b</color>
<color name="filtershow_categoryview_text">#a7a7a7</color>
<color name="filtershow_category_selection">#ffffffff</color>
<color name="gradcontrol_point_center">#ffffffff</color>
<color name="gradcontrol_point_edge">#ffffffff</color>
<color name="gradcontrol_graypoint_center">#888888</color>
<color name="gradcontrol_graypoint_edge">#BBBBBB</color>
- <color name="gradcontrol_point_shadow_start">#66000000</color>
+ <color name="gradcontrol_point_shadow_start">#6621272b</color>
<color name="gradcontrol_point_shadow_end">#00000000</color>
<color name="gradcontrol_line_color">#FFFFFF</color>
<color name="gradcontrol_line_shadow">#000000</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 14e8e299b..45a965f6b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -37,7 +37,7 @@
<item name="android:actionBarStyle">@style/Holo.ActionBar</item>
<item name="android:colorBackground">@null</item>
<item name="android:colorBackgroundCacheHint">@null</item>
- <item name="android:windowBackground">@drawable/filtershow_tiled_background</item>
+ <item name="android:windowBackground">@color/filtershow_background</item>
</style>
<style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
<item name="android:displayOptions">useLogo|showHome</item>
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 67fd3fe32..dcd0c927d 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -355,8 +355,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
ActionBar actionBar = getActionBar();
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
actionBar.setCustomView(R.layout.filtershow_actionbar);
- actionBar.setBackgroundDrawable(new ColorDrawable(
- getResources().getColor(R.color.background_screen)));
mSaveButton = actionBar.getCustomView();
mSaveButton.setOnClickListener(new OnClickListener() {