From 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 20 Jun 2017 11:23:41 -0700 Subject: Automated g4 rollback of changelist 158923709. *** Reason for rollback *** It's not necessary anymore after we verified it could be controlled from server side. *** Original change description *** Flip flag to enable ReturnToCall bubble. Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions. *** Also in the change: Restore TODOs Test: TH PiperOrigin-RevId: 159587541 Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b --- java/com/android/incallui/DialpadFragment.java | 2 +- java/com/android/incallui/InCallPresenter.java | 2 +- java/com/android/incallui/ReturnToCallController.java | 2 +- java/com/android/incallui/VideoCallPresenter.java | 4 ++-- java/com/android/incallui/answer/impl/hint/AnswerHint.java | 2 +- .../android/incallui/answerproximitysensor/AnswerProximitySensor.java | 2 +- java/com/android/incallui/autoresizetext/AutoResizeTextView.java | 2 +- java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java | 2 +- java/com/android/incallui/incall/impl/InCallPagerAdapter.java | 2 +- java/com/android/incallui/video/impl/VideoCallFragment.java | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java index 7f494aa61..c614d8412 100644 --- a/java/com/android/incallui/DialpadFragment.java +++ b/java/com/android/incallui/DialpadFragment.java @@ -125,7 +125,7 @@ public class DialpadFragment extends BaseFragment return this; } - // TODO Adds hardware keyboard listener + // TODO(klp) Adds hardware keyboard listener @Override public View onCreateView( diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 0bfd67e87..31a58c56a 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -1034,7 +1034,7 @@ public class InCallPresenter implements CallList.Listener { Log.d(this, "onActivityStarted"); notifyVideoPauseController(true); if (mStatusBarNotifier != null) { - // TODO - b/36649622: Investigate this redundant call + // TODO(maxwelb) - b/36649622: Investigate this redundant call mStatusBarNotifier.updateNotification(mCallList); } } diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index 314aa45d4..9e3388651 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -59,7 +59,7 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio private final PendingIntent endCall; public static boolean isEnabled(Context context) { - return !ConfigProviderBindings.get(context).getBoolean("disable_return_to_call_bubble", false); + return ConfigProviderBindings.get(context).getBoolean("enable_return_to_call_bubble", false); } public ReturnToCallController(Context context) { diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java index bd9837097..70f95e082 100644 --- a/java/com/android/incallui/VideoCallPresenter.java +++ b/java/com/android/incallui/VideoCallPresenter.java @@ -761,7 +761,7 @@ public class VideoCallPresenter /** * Adjusts the current video mode by setting up the preview and display surfaces as necessary. * Expected to be called whenever the video state associated with a call changes (e.g. a user - * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO: Need + * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO(vt): Need * to adjust size and orientation of preview surface here. */ private void adjustVideoMode(DialerCall call) { @@ -843,7 +843,7 @@ public class VideoCallPresenter if (!hasCameraPermission) { videoCall.setCamera(null); mPreviewSurfaceState = PreviewSurfaceState.NONE; - // TODO: Inform remote party that the video is off. This is similar to b/30256571. + // TODO(wangqi): Inform remote party that the video is off. This is similar to b/30256571. } else if (isCameraRequired) { InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager(); videoCall.setCamera(cameraManager.getActiveCameraId()); diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHint.java b/java/com/android/incallui/answer/impl/hint/AnswerHint.java index dd3b8228a..1e78f50b8 100644 --- a/java/com/android/incallui/answer/impl/hint/AnswerHint.java +++ b/java/com/android/incallui/answer/impl/hint/AnswerHint.java @@ -27,7 +27,7 @@ public interface AnswerHint { /** * Inflates the hint's layout into the container. * - *

TODO: if the hint becomes more dependent on other UI elements of the AnswerFragment, + *

TODO(twyen): if the hint becomes more dependent on other UI elements of the AnswerFragment, * should put put and hintText into another data structure. */ void onCreateView(LayoutInflater inflater, ViewGroup container, View puck, TextView hintText); diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java index 536a470b0..16fad8b17 100644 --- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java +++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java @@ -80,7 +80,7 @@ public class AnswerProximitySensor .getBoolean(CONFIG_ANSWER_PSEUDO_PROXIMITY_WAKE_LOCK_ENABLED, true)) { answerProximityWakeLock = new PseudoProximityWakeLock(context, pseudoScreenState); } else { - // TODO: choose a wake lock implementation base on framework/device. + // TODO(twyen): choose a wake lock implementation base on framework/device. // These bugs requires the PseudoProximityWakeLock workaround: // b/30439151 Proximity sensor not working on M // b/31499931 fautly touch input when screen is off on marlin/sailfish diff --git a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java index eedcbe5bb..5a22b93dc 100644 --- a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java +++ b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java @@ -146,7 +146,7 @@ public class AutoResizeTextView extends TextView { float maxTextSize = TypedValue.applyDimension(unit, size, displayMetrics); if (this.maxTextSize != maxTextSize) { this.maxTextSize = maxTextSize; - // TODO: It's not actually necessary to clear the whole cache here. To optimize cache + // TODO(tobyj): It's not actually necessary to clear the whole cache here. To optimize cache // deletion we'd have to delete all entries in the cache with a value equal or larger than // MIN(old_max_size, new_max_size) when changing maxTextSize; and all entries with a value // equal or smaller than MAX(old_min_size, new_min_size) when changing minTextSize. diff --git a/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java b/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java index a57bdf613..14a9c76b9 100644 --- a/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java +++ b/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java @@ -134,7 +134,7 @@ class LocationUrlBuilder { url += String.format(Locale.US, "(%s)", addressLine1.toString()); } } else { - // TODO: i18n + // TODO(mdooley): i18n url += String.format( Locale.US, diff --git a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java index bc0c61607..d4b04feff 100644 --- a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java +++ b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java @@ -39,7 +39,7 @@ public class InCallPagerAdapter extends FragmentStatePagerAdapter { if (position == getButtonGridPosition()) { return InCallButtonGridFragment.newInstance(); } else { - // TODO: handle fragment invalidation for when the data changes. + // TODO(calderwoodra): handle fragment invalidation for when the data changes. return MultimediaFragment.newInstance(attachments, true, false, false); } } diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 609cb691e..7d3c5c6e4 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -1120,12 +1120,12 @@ public class VideoCallFragment extends Fragment // This call takes less than 10 milliseconds. Bitmap bitmap = textureView.getBitmap(width, height); if (bitmap != null) { - // TODO: When the view is first displayed after a rotation the bitmap is empty + // TODO(mdooley): When the view is first displayed after a rotation the bitmap is empty // and thus this blur has no effect. // This call can take 100 milliseconds. blur(getContext(), bitmap, blurRadius); - // TODO: Figure out why only have to apply the transform in landscape mode + // TODO(mdooley): Figure out why only have to apply the transform in landscape mode if (width > height) { bitmap = Bitmap.createBitmap( -- cgit v1.2.3