diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-28 23:20:44 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-28 23:20:44 +0200 |
| commit | 77b1f2138e19545a48ea93c97f8518a87b065831 (patch) | |
| tree | 8e27fefdbe9b16991f2450f147aeee581337ec1b /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
| parent | 27ca7f72d158318076de59d60ccb28625f3bdbf7 (diff) | |
| parent | 0c0676b7dbf87e24ebcc4714adfb10d91e3d72b8 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 2e2700e9..2568e4b9 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -364,7 +364,7 @@ public abstract class XmppActivity extends Activity { mPrimaryTextColor = getResources().getColor(R.color.primaryText); mSecondaryTextColor = getResources().getColor(R.color.secondaryText); mTertiaryTextColor = getResources().getColor(R.color.black12); - mColorRed = getResources().getColor(R.color.warning); + mColorRed = getResources().getColor(R.color.error); mColorOrange = getResources().getColor(R.color.orange500); mColorGreen = getResources().getColor(R.color.online); mPrimaryColor = getResources().getColor(R.color.primary); |