filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Fix modifiers

Browse Source 
We either have too few or too many

Change-Id: I09a9a38b859c68526fcbcdbc7862afe1d693f6c0
This commit is contained in:
Michael W
2024-12-26 14:55:12 +01:00
parent 37d6d70835
commit 21cb2b6289
78 changed files with 528 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/ui/mediapicker/CameraManager.java
+3 -2
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -99,8 +100,8 @@ class CameraManager implements FocusOverlayManager.Listener {
* Callback when taking image or video
*/
interface MediaCallback {
static final int MEDIA_CAMERA_CHANGED = 1;
static final int MEDIA_NO_DATA = 2;
int MEDIA_CAMERA_CHANGED = 1;
int MEDIA_NO_DATA = 2;
void onMediaReady(Uri uriToMedia, String contentType, int width, int height);
void onMediaFailed(Exception exception);
src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java
+2
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -55,6 +56,7 @@ public class GalleryGridItemView extends FrameLayout {
}
@VisibleForTesting
final
GalleryGridItemData mData;
private AsyncImageView mImageView;
private CheckBox mCheckBox;
src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java
+2 -1
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -53,7 +54,7 @@ class GalleryMediaChooser extends MediaChooser implements
private View mMissingPermissionView;
/** Handles picking a media from the document picker. */
private DocumentImagePicker mDocumentImagePicker;
private final DocumentImagePicker mDocumentImagePicker;
GalleryMediaChooser(final MediaPicker mediaPicker) {
super(mediaPicker);
src/com/android/messaging/ui/mediapicker/HardwareCameraPreview.java
+2 -1
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -36,7 +37,7 @@ import java.io.IOException;
* implementations of the shared methods are delegated to CameraPreview
*/
public class HardwareCameraPreview extends TextureView implements CameraPreview.CameraPreviewHost {
private CameraPreview mPreview;
private final CameraPreview mPreview;
public HardwareCameraPreview(final Context context, final AttributeSet attrs) {
super(context, attrs);
src/com/android/messaging/ui/mediapicker/camerafocus/FocusIndicator.java
+6 -5
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -17,8 +18,8 @@
package com.android.messaging.ui.mediapicker.camerafocus;
public interface FocusIndicator {
public void showStart();
public void showSuccess(boolean timeout);
public void showFail(boolean timeout);
public void clear();
}
void showStart();
void showSuccess(boolean timeout);
void showFail(boolean timeout);
void clear();
}
src/com/android/messaging/ui/mediapicker/camerafocus/FocusOverlayManager.java
+8 -7
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -76,7 +77,7 @@ public class FocusOverlayManager {
private boolean mMeteringAreaSupported;
private boolean mLockAeAwbNeeded;
private boolean mAeAwbLock;
private Matrix mMatrix;
private final Matrix mMatrix;
private PieRenderer mPieRenderer;
@@ -89,14 +90,14 @@ public class FocusOverlayManager {
private String mFocusMode;
private String mOverrideFocusMode;
private Parameters mParameters;
private Handler mHandler;
Listener mListener;
private final Handler mHandler;
private final Listener mListener;
public interface Listener {
public void autoFocus();
public void cancelAutoFocus();
public boolean capture();
public void setFocusParameters();
void autoFocus();
void cancelAutoFocus();
boolean capture();
void setFocusParameters();
}
private class MainHandler extends Handler {
src/com/android/messaging/ui/mediapicker/camerafocus/PieItem.java
+4 -3
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -29,12 +30,12 @@ import java.util.List;
*/
public class PieItem {
public static interface OnClickListener {
public interface OnClickListener {
void onClick(PieItem item);
}
private Drawable mDrawable;
private int level;
private final int level;
private float mCenter;
private float start;
private float sweep;
@@ -199,4 +200,4 @@ public class PieItem {
setAlpha(mAlpha);
}
}
}
src/com/android/messaging/ui/mediapicker/camerafocus/PieRenderer.java
+11 -10
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -46,14 +47,14 @@ public class PieRenderer extends OverlayRenderer
// These states are used to make sure the animation is run for at least some
// time.
private volatile int mState;
private ScaleAnimation mAnimation = new ScaleAnimation();
private final ScaleAnimation mAnimation = new ScaleAnimation();
private static final int STATE_IDLE = 0;
private static final int STATE_FOCUSING = 1;
private static final int STATE_FINISHING = 2;
private static final int STATE_PIE = 8;
private Runnable mDisappear = new Disappear();
private Animation.AnimationListener mEndAction = new EndAction();
private final Runnable mDisappear = new Disappear();
private final Animation.AnimationListener mEndAction = new EndAction();
private static final int SCALING_UP_TIME = 600;
private static final int SCALING_DOWN_TIME = 100;
private static final int DISAPPEAR_TIMEOUT = 200;
@@ -114,7 +115,7 @@ public class PieRenderer extends OverlayRenderer
private LinearAnimation mFadeIn;
private volatile boolean mFocusCancelled;
private Handler mHandler = new Handler() {
private final Handler mHandler = new Handler() {
public void handleMessage(Message msg) {
switch(msg.what) {
case MSG_OPEN:
@@ -133,9 +134,9 @@ public class PieRenderer extends OverlayRenderer
private PieListener mListener;
public static interface PieListener {
public void onPieOpened(int centerX, int centerY);
public void onPieClosed();
public interface PieListener {
void onPieOpened(int centerX, int centerY);
void onPieClosed();
}
public void setPieListener(PieListener pl) {
@@ -801,8 +802,8 @@ public class PieRenderer extends OverlayRenderer
private class LinearAnimation extends Animation {
private float mFrom;
private float mTo;
private final float mFrom;
private final float mTo;
private float mValue;
public LinearAnimation(float from, float to) {
@@ -822,4 +823,4 @@ public class PieRenderer extends OverlayRenderer
}
}
}
}
src/com/android/messaging/ui/mediapicker/camerafocus/RenderOverlay.java
+11 -10
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -30,20 +31,20 @@ public class RenderOverlay extends FrameLayout {
interface Renderer {
public boolean handlesTouch();
public boolean onTouchEvent(MotionEvent evt);
public void setOverlay(RenderOverlay overlay);
public void layout(int left, int top, int right, int bottom);
public void draw(Canvas canvas);
boolean handlesTouch();
boolean onTouchEvent(MotionEvent evt);
void setOverlay(RenderOverlay overlay);
void layout(int left, int top, int right, int bottom);
void draw(Canvas canvas);
}
private RenderView mRenderView;
private List<Renderer> mClients;
private final RenderView mRenderView;
private final List<Renderer> mClients;
// reverse list of touch clients
private List<Renderer> mTouchClients;
private int[] mPosition = new int[2];
private final List<Renderer> mTouchClients;
private final int[] mPosition = new int[2];
public RenderOverlay(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -175,4 +176,4 @@ public class RenderOverlay extends FrameLayout {
}
}
}
}