Merge "incallui: make navigation bar translucent + other fixes" into cm-11.0

3 files changed, 36 insertions, 1 deletions

diff --git a/src/com/android/incallui/AnswerFragment.java b/src/com/android/incallui/AnswerFragment.java
index 1a5e8b6e..dbf9ace0 100644
--- a/src/com/android/incallui/AnswerFragment.java
+++ b/src/com/android/incallui/AnswerFragment.java
@@ -29,6 +29,7 @@ import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -102,13 +103,16 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
 
     @Override
     public void showAnswerUi(boolean show) {
+        final Window window = getActivity().getWindow();
         getView().setVisibility(show ? View.VISIBLE : View.GONE);
 
         Log.d(this, "Show answer UI: " + show);
         if (show) {
             mGlowpad.startPing();
+            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
         } else {
             mGlowpad.stopPing();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
         }
     }
 
diff --git a/src/com/android/incallui/ConferenceManagerFragment.java b/src/com/android/incallui/ConferenceManagerFragment.java
index 119b5f35..3dab85c4 100644
--- a/src/com/android/incallui/ConferenceManagerFragment.java
+++ b/src/com/android/incallui/ConferenceManagerFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.incallui;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -77,6 +78,11 @@ public class ConferenceManagerFragment
             @Override
             public void onClick(View v) {
                 getPresenter().manageConferenceDoneClicked();
+
+                final Activity activity = getActivity();
+                if (activity instanceof InCallActivity) {
+                    ((InCallActivity) activity).onManageConferenceDoneClicked();
+                }
             }
         });
 
@@ -205,4 +211,4 @@ public class ConferenceManagerFragment
             mConferenceTime.stop();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index 043bec09..15335645 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -66,6 +66,7 @@ public class InCallActivity extends Activity {
 
     /** Use to pass 'showDialpad' from {@link #onNewIntent} to {@link #onResume} */
     private boolean mShowDialpadRequested;
+    private boolean mConferenceManagerShown;
 
     // This enum maps to Phone.SuppService defined in telephony
     private enum SuppService {
@@ -129,6 +130,7 @@ public class InCallActivity extends Activity {
             mCallButtonFragment.displayDialpad(true);
             mShowDialpadRequested = false;
         }
+        updateSystemBarTranslucency();
     }
 
     // onPause is guaranteed to be called when the InCallActivity goes
@@ -244,6 +246,8 @@ public class InCallActivity extends Activity {
             return;
         } else if (mConferenceManagerFragment.isVisible()) {
             mConferenceManagerFragment.setVisible(false);
+            mConferenceManagerShown = false;
+            updateSystemBarTranslucency();
             return;
         }
 
@@ -474,9 +478,30 @@ public class InCallActivity extends Activity {
     public void displayManageConferencePanel(boolean showPanel) {
         if (showPanel) {
             mConferenceManagerFragment.setVisible(true);
+            mConferenceManagerShown = true;
+            updateSystemBarTranslucency();
         }
     }
 
+    public void onManageConferenceDoneClicked() {
+        if (mConferenceManagerShown && !mConferenceManagerFragment.isVisible()) {
+            mConferenceManagerShown = false;
+            updateSystemBarTranslucency();
+        }
+    }
+
+    private void updateSystemBarTranslucency() {
+        final boolean doTranslucency = !mConferenceManagerShown;
+        final Window window = getWindow();
+
+        if (doTranslucency) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        } else {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+        window.getDecorView().requestFitSystemWindows();
+    }
+
     // The function is called when Modify Call button gets pressed.
     // The function creates and displays modify call options.
     public void displayModifyCallOptions(final int callId) {