Change action bar icon and text color from white to grey
Change-Id: I52afd834d7b8699b55c34ad6f6102d425e79e1b5
Test: Manual
Bug: 109947100
Icon color: use ic_add_gnu_grey icon instead of white ic_add_24dp icon in
dialer settings -> calls -> Calling accounts -> SIP accounts.
Text color: change text color in action bar from white to grey in dialer
settings -> calls -> Calling accounts -> SIP accounts -> ADD ACCOUNTS.
"DISCARD" and "SAVE" are changed.
diff --git a/res/drawable-hdpi/ic_add_gnu_grey.png b/res/drawable-hdpi/ic_add_gnu_grey.png
new file mode 100644
index 0000000..9196537
--- /dev/null
+++ b/res/drawable-hdpi/ic_add_gnu_grey.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_gnu_grey.png b/res/drawable-mdpi/ic_add_gnu_grey.png
new file mode 100644
index 0000000..3afab9c
--- /dev/null
+++ b/res/drawable-mdpi/ic_add_gnu_grey.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_gnu_grey.png b/res/drawable-xhdpi/ic_add_gnu_grey.png
new file mode 100644
index 0000000..e85f779
--- /dev/null
+++ b/res/drawable-xhdpi/ic_add_gnu_grey.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_add_gnu_grey.png b/res/drawable-xxhdpi/ic_add_gnu_grey.png
new file mode 100644
index 0000000..b16ea9f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_add_gnu_grey.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_add_gnu_grey.png b/res/drawable-xxxhdpi/ic_add_gnu_grey.png
new file mode 100644
index 0000000..6fc56a4
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_add_gnu_grey.png
Binary files differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 065515a..bbbde4a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,13 +36,13 @@
<!-- Settings screen should use the same colors as the Dialer -->
<color name="phone_settings_background_color">#f5f5f5</color>
- <!-- Action bar text color. Ensure this stays in sync with Dialer actionbar_text_color. -->
- <color name="phone_settings_actionbar_text_color">#FFFFFF</color>
+ <!-- Action bar text color. Ensure this stays in sync with dialer_icon_color in aciton bar. -->
+ <color name="phone_settings_actionbar_text_color">#5f6368</color>
<!-- Background color of action bars. Ensure this stays in sync with Dialer
actionbar_background_color. -->
- <color name="actionbar_background_color">#fafafa</color>
+ <color name="actionbar_background_color">#ffffff</color>
<!-- Dark variant of the action bar color. Ensure this stays in sync with Dialer version. -->
- <color name="actionbar_background_color_dark">#fafafa</color>
+ <color name="actionbar_background_color_dark">#ffffff</color>
<!-- Color for icons in the actionbar. Ensure this stays in sync with Dialer version. -->
<color name="actionbar_icon_color">#ffffff</color>
@@ -58,7 +58,7 @@
<color name="emergency_shortcut_confirm_button_background_color">#E25142</color>
<!-- Color matches dialer settings light M2 theme.-->
- <color name="dialer_background_color">#fafafa</color>
+ <color name="dialer_background_color">#ffffff</color>
<color name="dialer_divider_color">#d8d8d8</color>
<color name="dialer_primary_text_color">#202124</color>
<color name="dialer_secondary_text_color">#5f6368</color>
diff --git a/sip/src/com/android/services/telephony/sip/SipSettings.java b/sip/src/com/android/services/telephony/sip/SipSettings.java
index 0d87798..ded16df 100644
--- a/sip/src/com/android/services/telephony/sip/SipSettings.java
+++ b/sip/src/com/android/services/telephony/sip/SipSettings.java
@@ -39,6 +39,8 @@
import android.view.Menu;
import android.view.MenuItem;
+import com.android.phone.R;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
@@ -46,8 +48,6 @@
import java.util.List;
import java.util.Map;
-import com.android.phone.R;
-
/**
* The PreferenceActivity class for managing sip profile preferences.
*/
@@ -410,7 +410,7 @@
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItem addAccountMenuItem = menu.add(0, MENU_ADD_ACCOUNT, 0, R.string.add_sip_account);
- addAccountMenuItem.setIcon(R.drawable.ic_add_24dp);
+ addAccountMenuItem.setIcon(R.drawable.ic_add_gnu_grey);
addAccountMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
return true;
}
