aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-13 22:43:54 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-13 23:12:28 +0200
commit1cdac08fa11daf2269df2808e7524ec657327162 (patch)
treecb53099343fdd051233624d34dbcc2c9aec89327
parent8feee8281a79217489077c9a0032ada21f8eda57 (diff)
update gradle version
-rw-r--r--build.gradle2
-rw-r--r--libs/MemorizingTrustManager/build.gradle2
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java2
-rw-r--r--src/main/res/drawable-hdpi/ic_lock_blue_18dp.pngbin396 -> 673 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.pngbin272 -> 586 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_lock_blue_18dp.pngbin314 -> 456 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.pngbin230 -> 358 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_lock_blue_18dp.pngbin596 -> 891 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.pngbin414 -> 711 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.pngbin669 -> 1445 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.pngbin399 -> 1203 bytes
11 files changed, 2 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index 85b446301..b849c847b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.0.0'
+ classpath 'com.android.tools.build:gradle:2.1.0'
}
}
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
index dc2e7b603..25dfabeb0 100644
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.0.0'
+ classpath 'com.android.tools.build:gradle:2.1.0'
}
}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index c6da69fff..b671a6f43 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -142,8 +142,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (viewHolder.edit_indicator != null) {
if (message.edited()) {
viewHolder.edit_indicator.setVisibility(View.VISIBLE);
- viewHolder.edit_indicator.setImageResource(darkBackground ? R.drawable.ic_mode_edit_white_18dp : R.drawable.ic_mode_edit_black_18dp);
- viewHolder.edit_indicator.setAlpha(darkBackground ? 0.7f : 0.57f);
} else {
viewHolder.edit_indicator.setVisibility(View.GONE);
}
diff --git a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
index 20fe4bbaa..923f98fab 100644
--- a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
index c32a27ae2..68e16fd62 100644
--- a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
+++ b/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
index 14b0c9e37..ccd919ac4 100644
--- a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
index 5ec4c0102..54a18c195 100644
--- a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
+++ b/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
index 7b4a6b307..ec72a70c1 100644
--- a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
index 0e1490625..9f1fab688 100644
--- a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
+++ b/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
index 72bf5c45e..aed4ca842 100644
--- a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
index 4f681f90a..d38d25e46 100644
--- a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
Binary files differ