diff options
Diffstat (limited to 'java/com')
3 files changed, 9 insertions, 7 deletions
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java index 86a2676f5..a26f322dd 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java @@ -58,6 +58,7 @@ import com.android.dialer.postcall.PostCall; import com.android.dialer.precall.PreCall; import com.android.dialer.rtt.RttTranscriptActivity; import com.android.dialer.rtt.RttTranscriptUtil; +import com.android.dialer.theme.base.ThemeComponent; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.i18n.phonenumbers.NumberParseException; @@ -116,6 +117,7 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { @CallSuper protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTheme(ThemeComponent.get(this).theme().getApplicationThemeRes()); setContentView(R.layout.call_details_activity); Toolbar toolbar = findViewById(R.id.toolbar); toolbar.setTitle(R.string.call_details); diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 8316d76ee..99ff7255e 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -709,13 +709,13 @@ public class StatusBarNotifier } } else if (call.getState() == DialerCallState.ONHOLD) { resId = R.string.notification_on_hold; + } else if (DialerCallState.isDialing(call.getState())) { + resId = R.string.notification_dialing; } else if (call.isVideoCall()) { resId = call.getVideoTech().isPaused() ? R.string.notification_ongoing_paused_video_call : R.string.notification_ongoing_video_call; - } else if (DialerCallState.isDialing(call.getState())) { - resId = R.string.notification_dialing; } else if (call.getVideoTech().getSessionModificationState() == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { resId = R.string.notification_requesting_video_call; diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 11b80ceb9..901facb01 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -541,13 +541,13 @@ public class VideoCallFragment extends Fragment return new Point(); } if (isLandscape()) { - int stableInsetEnd = + int systemWindowInsetEnd = getView().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL - ? getView().getRootWindowInsets().getStableInsetLeft() - : -getView().getRootWindowInsets().getStableInsetRight(); - return new Point(stableInsetEnd, 0); + ? getView().getRootWindowInsets().getSystemWindowInsetLeft() + : -getView().getRootWindowInsets().getSystemWindowInsetRight(); + return new Point(systemWindowInsetEnd, 0); } else { - return new Point(0, -getView().getRootWindowInsets().getStableInsetBottom()); + return new Point(0, -getView().getRootWindowInsets().getSystemWindowInsetBottom()); } } |