Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf8dfce authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Create controller for StatusBarWindowView. 

This moves most of the logic out of the view and into
StatusBarWindowViewController. It is not beautiful, but
it is cleaner than before.

This removes the final call to Dependency.get(FalsingManager.class).

This also fixes a small, old bug in
StatusBarWindowView.onInterceptTouchEvent where the results
of calling hte super method were being unintentionally ingored.
(This bug would have been introduced nearly seven years ago.)

Bug: 141751146,136279712
Test: atest SystemUITests
Change-Id: I5e09c1c0f2a3098db1a47837ddce3d382099f483
parent 8e73c69e

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+6 −3
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; 
import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarIconController;

import com.android.systemui.statusbar.phone.StatusBarWindowController;

import com.android.systemui.statusbar.phone.StatusBarWindowViewController;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -294,7 +295,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            AssistManager assistManager,

            NotificationListener notificationListener,

            ConfigurationController configurationController,

            StatusBarWindowController statusBarWindowController) {

            StatusBarWindowController statusBarWindowController,

            StatusBarWindowViewController.Builder statusBarWindowViewControllerBuild) {

        super(

                lightBarController,

                autoHideController,
@@ -347,7 +349,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                assistManager,

                notificationListener,

                configurationController,

                statusBarWindowController);

                statusBarWindowController,

                statusBarWindowViewControllerBuild);

        mNavigationBarController = navigationBarController;

    }
@@ -778,7 +781,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            return;

        }

        mStatusBarWindowController.setStatusBarFocusable(false);

        mStatusBarWindow.cancelExpandHelper();

        mStatusBarWindowViewController.cancelExpandHelper();

        mStatusBarView.collapsePanel(true /* animate */, delayed, speedUpFactor);



        animateNotificationPanel(mClosingVelocity, true);

packages/SystemUI/res/layout/status_bar_expanded.xml

+3 −9
Original line number Diff line number Diff line
@@ -17,14 +17,9 @@ 
*/

-->



<com.android.systemui.statusbar.phone.NotificationPanelView

<merge

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/notification_panel"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/transparent" >



    xmlns:systemui="http://schemas.android.com/apk/res-auto">

    <FrameLayout

        android:id="@+id/big_clock_container"

        android:layout_width="match_parent"
@@ -112,5 +107,4 @@ 
        android:background="@drawable/qs_navbar_scrim" />



    <include layout="@layout/status_bar_expanded_plugin_frame"/>



</com.android.systemui.statusbar.phone.NotificationPanelView>
 
</merge>
 
 No newline at end of file

packages/SystemUI/res/layout/super_status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
        sysui:ignoreRightInset="true"

        />



    <include layout="@layout/status_bar_expanded"

    <ViewStub android:id="@+id/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible" />

packages/SystemUI/res/values/ids.xml

+3 −0
Original line number Diff line number Diff line
@@ -141,5 +141,8 @@ 


    <!-- Global Actions Menu -->

    <item type="id" name="global_actions_view" />



    <!-- NotificationPanelView -->

    <item type="id" name="notification_panel" />

</resources>

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Context; 
import android.content.res.Resources;

import android.graphics.Color;

import android.os.Handler;

import android.os.Looper;

import android.os.RemoteException;

import android.os.UserHandle;

import android.text.TextUtils;
@@ -135,7 +134,7 @@ public class KeyguardStatusView extends GridLayout implements 
        super(context, attrs, defStyle);

        mIActivityManager = ActivityManager.getService();

        mLockPatternUtils = new LockPatternUtils(getContext());

        mHandler = new Handler(Looper.myLooper());

        mHandler = new Handler();

        onDensityOrFontScaleChanged();

    }