From 62e72f77a719de69b24ee5417d966a3978775e09 Mon Sep 17 00:00:00 2001
From: Muyuan Li <muyuanli@google.com>
Date: Thu, 26 May 2016 16:46:50 -0700
Subject: [PATCH] sysui: refactor for extension.

refactor status bar transition mode computation
logic into separate method.

Bug: 28942131
Change-Id: I5f46b6964ab431f009afcb9caf41e69e345090dd
(cherry picked from commit d8c64f23ea7020f9043a8e462b0903131560a875)
---
 .../statusbar/phone/PhoneStatusBar.java        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 5c0c20e879a7c..2aea36389fba8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2862,9 +2862,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             }
 
             // update status bar mode
-            final int sbMode = computeBarMode(oldVal, newVal, mStatusBarView.getBarTransitions(),
-                    View.STATUS_BAR_TRANSIENT, View.STATUS_BAR_TRANSLUCENT,
-                    View.STATUS_BAR_TRANSPARENT);
+            final int sbMode = computeStatusBarMode(oldVal, newVal);
 
             // update navigation bar mode
             final int nbMode = mNavigationBarView == null ? -1 : computeBarMode(
@@ -2911,7 +2909,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                 mask, fullscreenStackBounds, dockedStackBounds, sbModeChanged, mStatusBarMode);
     }
 
-    private int computeBarMode(int oldVis, int newVis, BarTransitions transitions,
+    protected int computeStatusBarMode(int oldVal, int newVal) {
+        return computeBarMode(oldVal, newVal, getStatusBarTransitions(),
+                View.STATUS_BAR_TRANSIENT, View.STATUS_BAR_TRANSLUCENT,
+                View.STATUS_BAR_TRANSPARENT);
+    }
+
+    protected BarTransitions getStatusBarTransitions() {
+        return mStatusBarView.getBarTransitions();
+    }
+
+    protected int computeBarMode(int oldVis, int newVis, BarTransitions transitions,
             int transientFlag, int translucentFlag, int transparentFlag) {
         final int oldMode = barMode(oldVis, transientFlag, translucentFlag, transparentFlag);
         final int newMode = barMode(newVis, transientFlag, translucentFlag, transparentFlag);
@@ -2933,7 +2941,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
     private void checkBarModes() {
         if (mDemoMode) return;
-        checkBarMode(mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions(),
+        checkBarMode(mStatusBarMode, mStatusBarWindowState, getStatusBarTransitions(),
                 mNoAnimationOnNextBarModeChange);
         if (mNavigationBarView != null) {
             checkBarMode(mNavigationBarMode,