diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-15 07:24:26 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-15 07:24:26 +0000 |
commit | fa70611bdcfcaef33e4f376d796083860ac86258 (patch) | |
tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/incallui/InCallPresenter.java | |
parent | fb4a3213222d7c472e6f32df1a82adfbd2b0b39a (diff) | |
parent | 9a6afa3ae2bfc0074f7f64a7ec3238c26e913c3c (diff) | |
download | android_packages_apps_Dialer-fa70611bdcfcaef33e4f376d796083860ac86258.tar.gz android_packages_apps_Dialer-fa70611bdcfcaef33e4f376d796083860ac86258.tar.bz2 android_packages_apps_Dialer-fa70611bdcfcaef33e4f376d796083860ac86258.zip |
release-request-4be129b1-3f50-40d3-bbd4-30899b786745-for-git_oc-dr1-release-4273712 snap-temp-L56000000093068720staging/lineage-15.0_rebase-android-8.0.0_r23
Change-Id: I17e1756ec06b4ee5a5a3a98c327eec0b1a83d319
Diffstat (limited to 'java/com/android/incallui/InCallPresenter.java')
-rw-r--r-- | java/com/android/incallui/InCallPresenter.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 1528e7dcf..563468e84 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -189,6 +189,8 @@ public class InCallPresenter implements CallList.Listener { /** Determines if the InCall UI is in fullscreen mode or not. */ private boolean mIsFullScreen = false; + private boolean mScreenTimeoutEnabled = true; + private PhoneStateListener mPhoneStateListener = new PhoneStateListener() { @Override @@ -395,6 +397,7 @@ public class InCallPresenter implements CallList.Listener { } private void attemptFinishActivity() { + mScreenTimeoutEnabled = true; final boolean doFinish = (mInCallActivity != null && isActivityStarted()); LogUtil.i("InCallPresenter.attemptFinishActivity", "Hide in call UI: " + doFinish); if (doFinish) { @@ -1064,6 +1067,7 @@ public class InCallPresenter implements CallList.Listener { // TODO - b/36649622: Investigate this redundant call mStatusBarNotifier.updateNotification(mCallList); } + applyScreenTimeout(); } /*package*/ @@ -1577,13 +1581,18 @@ public class InCallPresenter implements CallList.Listener { public void enableScreenTimeout(boolean enable) { LogUtil.v("InCallPresenter.enableScreenTimeout", "enableScreenTimeout: value=" + enable); + mScreenTimeoutEnabled = enable; + applyScreenTimeout(); + } + + private void applyScreenTimeout() { if (mInCallActivity == null) { - LogUtil.e("InCallPresenter.enableScreenTimeout", "InCallActivity is null."); + LogUtil.e("InCallPresenter.applyScreenTimeout", "InCallActivity is null."); return; } final Window window = mInCallActivity.getWindow(); - if (enable) { + if (mScreenTimeoutEnabled) { window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } else { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); |