From 37ac798c535e220db7a46496feaa2c4c43f861ef Mon Sep 17 00:00:00 2001 From: Michael W Date: Thu, 10 Apr 2025 13:12:04 +0200 Subject: [PATCH] Messaging: Remove VisibleForAnimation It's meant for reflection, but we don't care about that Change-Id: Id2310a04fb90f39cb9b52fcb183073504b64bcba --- proguard.flags | 8 +------ .../annotation/VisibleForAnimation.java | 23 ------------------- .../messaging/ui/AttachmentPreview.java | 4 +--- .../ConversationMessageBubbleView.java | 4 +--- .../ConversationListFragment.java | 1 - .../ConversationListItemView.java | 5 +--- 6 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 src/com/android/messaging/annotation/VisibleForAnimation.java diff --git a/proguard.flags b/proguard.flags index c992796..f319a02 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,5 +1,5 @@ # Copyright (C) 2015 The Android Open Source Project -# Copyright (C) 2024 The LineageOS Project +# Copyright (C) 2024-2025 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,12 +21,6 @@ -keep class com.android.messaging.*.* { *; } -keep class com.android.messaging.*.*.* { *; } -# Keep methods that have the @VisibleForAnimation annotation --keep @interface com.android.messaging.annotation.VisibleForAnimation --keepclassmembers class * { - @com.android.messaging.annotation.VisibleForAnimation *; -} - -keep public class * extends android.app.Activity -keep public class * extends android.app.Application -keep public class * extends android.app.Service diff --git a/src/com/android/messaging/annotation/VisibleForAnimation.java b/src/com/android/messaging/annotation/VisibleForAnimation.java deleted file mode 100644 index f97d827..0000000 --- a/src/com/android/messaging/annotation/VisibleForAnimation.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.messaging.annotation; - -/** - * An annotation for class members that are made visible for Android's ObjectAnimator to work - * properly through reflection. - */ -public @interface VisibleForAnimation { -} diff --git a/src/com/android/messaging/ui/AttachmentPreview.java b/src/com/android/messaging/ui/AttachmentPreview.java index 6db84c6..0e605e8 100644 --- a/src/com/android/messaging/ui/AttachmentPreview.java +++ b/src/com/android/messaging/ui/AttachmentPreview.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project - * Copyright (C) 2024 The LineageOS Project + * Copyright (C) 2024-2025 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import android.widget.ImageButton; import android.widget.ScrollView; import com.android.messaging.R; -import com.android.messaging.annotation.VisibleForAnimation; import com.android.messaging.datamodel.data.DraftMessageData; import com.android.messaging.datamodel.data.MediaPickerMessagePartData; import com.android.messaging.datamodel.data.MessagePartData; @@ -277,7 +276,6 @@ public class AttachmentPreview extends ScrollView implements OnAttachmentClickLi } } - @VisibleForAnimation public void setAnimatedHeight(final int animatedHeight) { if (mAnimatedHeight != animatedHeight) { mAnimatedHeight = animatedHeight; diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageBubbleView.java b/src/com/android/messaging/ui/conversation/ConversationMessageBubbleView.java index 39e5a19..b97569d 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageBubbleView.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageBubbleView.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project - * Copyright (C) 2024 The LineageOS Project + * Copyright (C) 2024-2025 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import android.widget.LinearLayout; import androidx.annotation.NonNull; import com.android.messaging.R; -import com.android.messaging.annotation.VisibleForAnimation; import com.android.messaging.datamodel.data.ConversationMessageBubbleData; import com.android.messaging.datamodel.data.ConversationMessageData; import com.android.messaging.util.UiUtils; @@ -77,7 +76,6 @@ public class ConversationMessageBubbleView extends LinearLayout { mBubbleBackground.requestLayout(); } - @VisibleForAnimation public void setMorphWidth(final int width) { mMorphedWidth = width; requestLayout(); diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java index d75a8ac..bea8166 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java @@ -42,7 +42,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.messaging.R; -import com.android.messaging.annotation.VisibleForAnimation; import com.android.messaging.datamodel.DataModel; import com.android.messaging.datamodel.binding.Binding; import com.android.messaging.datamodel.binding.BindingBase; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java b/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java index 7d7be8a..63c3f51 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project - * Copyright (C) 2024 The LineageOS Project + * Copyright (C) 2024-2025 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,6 @@ import androidx.core.text.TextDirectionHeuristicsCompat; import com.android.messaging.Factory; import com.android.messaging.R; -import com.android.messaging.annotation.VisibleForAnimation; import com.android.messaging.datamodel.MessagingContentProvider; import com.android.messaging.datamodel.action.UpdateConversationArchiveStatusAction; import com.android.messaging.datamodel.data.ConversationListItemData; @@ -519,12 +518,10 @@ public class ConversationListItemView extends FrameLayout implements OnClickList return mHostInterface.isSwipeAnimatable(); } - @VisibleForAnimation public float getSwipeTranslationX() { return mSwipeableContainer.getTranslationX(); } - @VisibleForAnimation public void setSwipeTranslationX(final float translationX) { mSwipeableContainer.setTranslationX(translationX); if (translationX == 0) {