diff options
Diffstat (limited to 'java/com/android/incallui/video/impl')
-rw-r--r-- | java/com/android/incallui/video/impl/VideoCallFragment.java | 4 | ||||
-rw-r--r-- | java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index b0beb77c1..a3614c09c 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -85,7 +85,7 @@ import com.android.incallui.videosurface.protocol.VideoSurfaceTexture; import com.android.incallui.videotech.utils.VideoUtils; /** Contains UI elements for a video call. */ -// LINT.IfChange + public class VideoCallFragment extends Fragment implements InCallScreen, InCallButtonUi, @@ -1271,4 +1271,4 @@ public class VideoCallFragment extends Fragment } } } -// LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java) + diff --git a/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml b/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml index ad984f36e..3cf050467 100644 --- a/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml +++ b/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content"/> <!-- We have to keep deprecated singleLine to allow long text being truncated with ellipses. - b/31396406 --> + a bug --> <com.android.incallui.autoresizetext.AutoResizeTextView android:id="@id/contactgrid_contact_name" android:layout_width="wrap_content" |