Import new expand icons
Also update X close icons to be vector drawables, tinting
them to the proper colors where they are currently used.
Test:
Manually verified the following with Bullhead on M (MDA70B):
1. Dropdown icons in compact and full editors are 54% transparent
black.
2. X's next to edit text views are 38% transparent black.
3. X's in search and selection bar are still 54% transparent
black.
Bug: 30160325
Change-Id: Ice24a70f02141f641c389060c37bdc87b727b230
diff --git a/res/drawable/ic_close_black_24dp.xml b/res/drawable/ic_close_24dp.xml
similarity index 95%
rename from res/drawable/ic_close_black_24dp.xml
rename to res/drawable/ic_close_24dp.xml
index 14513be..52070d5 100644
--- a/res/drawable/ic_close_black_24dp.xml
+++ b/res/drawable/ic_close_24dp.xml
@@ -20,6 +20,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="@android:color/white"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>
diff --git a/res/drawable/ic_menu_expand_maximized_24dp.xml b/res/drawable/ic_menu_expand_maximized_24dp.xml
new file mode 100644
index 0000000..9c626cc
--- /dev/null
+++ b/res/drawable/ic_menu_expand_maximized_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_expand_minimized_24dp.xml b/res/drawable/ic_menu_expand_minimized_24dp.xml
new file mode 100644
index 0000000..95a1bf7
--- /dev/null
+++ b/res/drawable/ic_menu_expand_minimized_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+</vector>
\ No newline at end of file
diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml
index d2c7fb9..d352801 100644
--- a/res/layout/edit_delete_button.xml
+++ b/res/layout/edit_delete_button.xml
@@ -29,7 +29,8 @@
android:layout_gravity="center"
android:duplicateParentState="true"
android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_menu_remove_field_holo_light"
+ android:src="@drawable/ic_close_24dp"
+ android:tint="@color/quantum_black_hint_text"
android:paddingLeft="@dimen/editor_round_button_padding_left"
android:paddingRight="@dimen/editor_round_button_padding_right"
android:paddingStart="@dimen/editor_round_button_padding_left"
diff --git a/res/layout/editor_account_header.xml b/res/layout/editor_account_header.xml
index 5a93b58..3a382f4 100644
--- a/res/layout/editor_account_header.xml
+++ b/res/layout/editor_account_header.xml
@@ -66,7 +66,8 @@
<ImageView
android:id="@+id/account_expander_icon"
- android:src="@drawable/ic_menu_expander_minimized_holo_light"
+ android:src="@drawable/ic_menu_expand_minimized_24dp"
+ android:tint="@color/quantum_black_secondary_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
diff --git a/res/layout/editor_all_rawcontacts_accounts_selector.xml b/res/layout/editor_all_rawcontacts_accounts_selector.xml
index c830d38..7cff162 100644
--- a/res/layout/editor_all_rawcontacts_accounts_selector.xml
+++ b/res/layout/editor_all_rawcontacts_accounts_selector.xml
@@ -45,7 +45,8 @@
android:ellipsize="end" />
<ImageView
- android:src="@drawable/ic_menu_expander_minimized_holo_light"
+ android:src="@drawable/ic_menu_expand_minimized_24dp"
+ android:tint="@color/quantum_black_secondary_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
diff --git a/res/layout/name_edit_expansion_view.xml b/res/layout/name_edit_expansion_view.xml
index 13a50a8..4d1bd61 100644
--- a/res/layout/name_edit_expansion_view.xml
+++ b/res/layout/name_edit_expansion_view.xml
@@ -32,6 +32,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:duplicateParentState="true"
+ android:tint="@color/quantum_black_secondary_text"
android:background="?android:attr/selectableItemBackground"
android:paddingLeft="@dimen/editor_round_button_padding_left"
android:paddingRight="@dimen/editor_round_button_padding_right"
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index ecadbd1..945521f 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -53,10 +53,10 @@
android:layout_height="@dimen/search_box_close_icon_size"
android:layout_width="@dimen/search_box_close_icon_size"
android:padding="@dimen/search_box_close_icon_padding"
- android:src="@drawable/ic_close_black_24dp"
+ android:src="@drawable/ic_close_24dp"
+ android:tint="@color/quantum_black_secondary_text"
android:clickable="true"
android:background="?attr/selectableItemBackgroundBorderless"
- android:contentDescription="@string/description_clear_search"
- android:alpha="@dimen/close_icon_alpha" />
+ android:contentDescription="@string/description_clear_search" />
</LinearLayout>
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index 72a5a10..b26dc8a 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -25,10 +25,10 @@
android:layout_width="@dimen/selection_bar_close_icon_size"
android:layout_height="@dimen/selection_bar_close_icon_size"
android:layout_gravity="center_vertical|start"
- android:alpha="@dimen/close_icon_alpha"
+ android:tint="@color/quantum_black_secondary_text"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_edit_select"
- android:src="@drawable/ic_close_black_24dp"/>
+ android:src="@drawable/ic_close_24dp"/>
<TextView
android:id="@+id/selection_count_text"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 771ba44..607b7a0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,6 +14,11 @@
limitations under the License.
-->
<resources>
+ <!-- 54% black -->
+ <color name="quantum_black_secondary_text">#89000000</color>
+
+ <!-- 38% black -->
+ <color name="quantum_black_hint_text">#61000000</color>
<color name="quickcontact_name_detail_background">#66000000</color>
<color name="quickcontact_entry_sub_header_text_color">#737373</color>
diff --git a/src/com/android/contacts/editor/BaseRawContactEditorView.java b/src/com/android/contacts/editor/BaseRawContactEditorView.java
index fc1e8a1..1cdfafb 100644
--- a/src/com/android/contacts/editor/BaseRawContactEditorView.java
+++ b/src/com/android/contacts/editor/BaseRawContactEditorView.java
@@ -81,6 +81,7 @@
mAccountHeaderContainer = findViewById(R.id.account_header_container);
mExpandAccountButton = (ImageView) findViewById(R.id.account_expander_icon);
+ mExpandAccountButton.setColorFilter(R.color.quantum_black_secondary_text);
mCollapsibleSection = (LinearLayout) findViewById(R.id.collapsable_section);
mAccountName = (TextView) findViewById(R.id.account_name);
mAccountType = (TextView) findViewById(R.id.account_type);
@@ -187,11 +188,13 @@
if (isCollapsed) {
params.height = 0;
mCollapsibleSection.setLayoutParams(params);
- mExpandAccountButton.setImageResource(R.drawable.ic_menu_expander_minimized_holo_light);
+ mExpandAccountButton.setImageDrawable(getContext().getDrawable(
+ R.drawable.ic_menu_expand_minimized_24dp));
} else {
params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
mCollapsibleSection.setLayoutParams(params);
- mExpandAccountButton.setImageResource(R.drawable.ic_menu_expander_maximized_holo_light);
+ mExpandAccountButton.setImageDrawable(getContext().getDrawable(
+ R.drawable.ic_menu_expand_maximized_24dp));
}
}
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index df201e1..77b584c 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.ContactsContract;
@@ -39,9 +40,9 @@
import android.widget.LinearLayout;
import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
import com.android.contacts.common.ContactsUtils;
+import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.common.model.RawContactDelta;
import com.android.contacts.common.model.ValuesDelta;
import com.android.contacts.common.model.account.AccountType.EditField;
import com.android.contacts.common.model.dataitem.DataKind;
@@ -165,9 +166,10 @@
* Creates or removes the type/label button. Doesn't do anything if already correctly configured
*/
private void setupExpansionView(boolean shouldExist, boolean collapsed) {
- mExpansionView.setImageResource(collapsed
- ? R.drawable.ic_menu_expander_minimized_holo_light
- : R.drawable.ic_menu_expander_maximized_holo_light);
+ final Drawable expandIcon = getContext().getDrawable(collapsed
+ ? R.drawable.ic_menu_expand_minimized_24dp
+ : R.drawable.ic_menu_expand_maximized_24dp);
+ mExpansionView.setImageDrawable(expandIcon);
mExpansionViewContainer.setVisibility(shouldExist ? View.VISIBLE : View.INVISIBLE);
}