New minitab assets, and dithering fix.
The dithering flag we were setting in the layout was being overriden. We
are now setting it directly on the StateListDrawable in code.
diff --git a/res/drawable-finger/tab_focused.9.png b/res/drawable-finger/tab_focused.9.png
index 389cefd..fbc1d3f 100644
--- a/res/drawable-finger/tab_focused.9.png
+++ b/res/drawable-finger/tab_focused.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_focused_bottom.9.png b/res/drawable-finger/tab_focused_bottom.9.png
index 64298be..0ca71f0 100644
--- a/res/drawable-finger/tab_focused_bottom.9.png
+++ b/res/drawable-finger/tab_focused_bottom.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_focused_dithered.xml b/res/drawable-finger/tab_focused_dithered.xml
deleted file mode 100644
index c842543..0000000
--- a/res/drawable-finger/tab_focused_dithered.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/tab_focused"
- android:dither="true"
-/>
diff --git a/res/drawable-finger/tab_indicator_bg.xml b/res/drawable-finger/tab_indicator_bg.xml
index 15ab727..fb54954 100644
--- a/res/drawable-finger/tab_indicator_bg.xml
+++ b/res/drawable-finger/tab_indicator_bg.xml
@@ -20,23 +20,23 @@
android:state_focused="false"
android:state_selected="false"
android:state_pressed="false"
- android:drawable="@drawable/tab_unselected_dithered" />
+ android:drawable="@drawable/tab_unselected" />
<item
android:state_focused="false"
android:state_selected="true"
android:state_pressed="false"
- android:drawable="@drawable/tab_selected_dithered" />
+ android:drawable="@drawable/tab_selected" />
<!-- Focused states -->
<item
android:state_focused="true"
android:state_selected="true"
android:state_pressed="false"
- android:drawable="@drawable/tab_focused_dithered" />
+ android:drawable="@drawable/tab_focused" />
<!-- Pressed -->
<item
android:state_pressed="true"
- android:drawable="@drawable/tab_pressed_dithered" />
+ android:drawable="@drawable/tab_pressed" />
</selector>
\ No newline at end of file
diff --git a/res/drawable-finger/tab_pressed.9.png b/res/drawable-finger/tab_pressed.9.png
index f8c06fb..dbada51 100644
--- a/res/drawable-finger/tab_pressed.9.png
+++ b/res/drawable-finger/tab_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_pressed_bottom.9.png b/res/drawable-finger/tab_pressed_bottom.9.png
index 1447a4e..780cdb5 100644
--- a/res/drawable-finger/tab_pressed_bottom.9.png
+++ b/res/drawable-finger/tab_pressed_bottom.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_pressed_dithered.xml b/res/drawable-finger/tab_pressed_dithered.xml
deleted file mode 100644
index 2469678..0000000
--- a/res/drawable-finger/tab_pressed_dithered.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/tab_pressed"
- android:dither="true"
-/>
diff --git a/res/drawable-finger/tab_selected.9.png b/res/drawable-finger/tab_selected.9.png
index 4cb9d67..3e7ca81 100644
--- a/res/drawable-finger/tab_selected.9.png
+++ b/res/drawable-finger/tab_selected.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_selected_bottom.9.png b/res/drawable-finger/tab_selected_bottom.9.png
index 55d6cad..0b61685 100644
--- a/res/drawable-finger/tab_selected_bottom.9.png
+++ b/res/drawable-finger/tab_selected_bottom.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_selected_dithered.xml b/res/drawable-finger/tab_selected_dithered.xml
deleted file mode 100644
index d1d235c..0000000
--- a/res/drawable-finger/tab_selected_dithered.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/tab_selected"
- android:dither="true"
-/>
diff --git a/res/drawable-finger/tab_unselected.9.png b/res/drawable-finger/tab_unselected.9.png
index 4d4c017..fce7d87 100644
--- a/res/drawable-finger/tab_unselected.9.png
+++ b/res/drawable-finger/tab_unselected.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_unselected_dithered.xml b/res/drawable-finger/tab_unselected_dithered.xml
deleted file mode 100644
index 32c6509..0000000
--- a/res/drawable-finger/tab_unselected_dithered.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/tab_unselected"
- android:dither="true"
-/>
diff --git a/src/com/android/contacts/BaseContactCardActivity.java b/src/com/android/contacts/BaseContactCardActivity.java
index 58ea990..ef84e69 100644
--- a/src/com/android/contacts/BaseContactCardActivity.java
+++ b/src/com/android/contacts/BaseContactCardActivity.java
@@ -233,6 +233,7 @@
final LayoutInflater inflater = (LayoutInflater)parent.getContext().getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
final View tabIndicator = inflater.inflate(R.layout.tab_indicator, parent, false);
+ tabIndicator.getBackground().setDither(true);
final TextView tv = (TextView) tabIndicator.findViewById(R.id.tab_title);
tv.setText(label);
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 87e6718..beaea44 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -262,6 +262,7 @@
private void addAllTab() {
View allTabIndicator = mInflater.inflate(R.layout.all_tab_indicator, mTabWidget, false);
+ allTabIndicator.getBackground().setDither(true);
addTab(ALL_CONTACTS_ID, allTabIndicator);
}
