From 646b2f028cbdd84c6b5d70fc68e0644a2f467cef Mon Sep 17 00:00:00 2001 From: "Dr. Tobias Quathamer" Date: Thu, 20 Apr 2017 14:37:07 +0200 Subject: [PATCH] Revert 38d3c6c6 for now --- .../java/com/b44t/ui/Components/ChatActivityEnterView.java | 4 ++-- .../src/main/java/com/b44t/ui/Components/EmojiView.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java index 9e282502b..6b328bb84 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java @@ -41,7 +41,6 @@ import android.media.AudioManager; import android.os.Build; import android.os.PowerManager; import android.os.SystemClock; -import android.support.v7.widget.AppCompatEditText; import android.text.Editable; import android.text.SpannableStringBuilder; import android.text.TextWatcher; @@ -55,6 +54,7 @@ import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.inputmethod.EditorInfo; +import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; @@ -148,7 +148,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe } } - private class EditTextCaption extends AppCompatEditText { + private class EditTextCaption extends EditText { private Object editor; private Field editorField; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java index c55bda480..4bd3e4849 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java @@ -36,7 +36,6 @@ import android.graphics.drawable.Drawable; import android.graphics.Color; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; -import android.support.v7.widget.AppCompatImageView; import android.util.TypedValue; import android.view.Gravity; import android.view.HapticFeedbackConstants; @@ -112,7 +111,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } }; - private class ImageViewEmoji extends AppCompatImageView { + private class ImageViewEmoji extends ImageView { private boolean touched; private float lastX; @@ -934,7 +933,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific FrameLayout frameLayout = new FrameLayout(context); pagerSlidingTabStripContainer.addView(frameLayout, LayoutHelper.createLinear(52, 48)); - backspaceButton = new AppCompatImageView(context) { + backspaceButton = new ImageView(context) { @Override public boolean onTouchEvent(MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN) {