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

Commit da13c3fd authored by Zhuoyao Zhang's avatar Zhuoyao Zhang
Browse files

Revert "Refactor PanelView and NotificationPanelView into Controllers." 

Revert "NoticationPanelView now has a controller."

Revert submission 9930899-b141751146-npv-controller

Reason for revert: b/147295216
Reverted Changes:
I9a92cad63: Refactor PanelView and NotificationPanelView into ...
I454bc4790: NoticationPanelView now has a controller.

Change-Id: Iae9db40e9385e1b88bd2f5f162a5f6d53d91878d
parent 59b9496c

core/java/com/android/internal/util/LatencyTracker.java

+1 −5
Original line number Diff line number Diff line
@@ -121,11 +121,7 @@ public class LatencyTracker { 
    }



    public static boolean isEnabled(Context ctx) {

        return getInstance(ctx).isEnabled();

    }



    public boolean isEnabled() {

        return Build.IS_DEBUGGABLE && mEnabled;

        return Build.IS_DEBUGGABLE && getInstance(ctx).mEnabled;

    }



    /**

packages/CarSystemUI/res/layout/super_status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <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/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -128,11 +128,11 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; 
import com.android.systemui.statusbar.phone.ScrimController;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -465,7 +465,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 


        super.start();



        mNotificationPanelViewController.setScrollingEnabled(true);

        mNotificationPanel.setScrollingEnabled(true);

        mSettleOpenPercentage = mContext.getResources().getInteger(

                R.integer.notification_settle_open_percentage);

        mSettleClosePercentage = mContext.getResources().getInteger(

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

+1 −1
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper 
import com.android.systemui.statusbar.phone.NotificationGroupManager;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

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

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

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

packages/SystemUI/res/layout/status_bar_expanded.xml

+3 −8
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"
@@ -102,4 +97,4 @@ 
        android:background="@drawable/qs_navbar_scrim" />



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

</com.android.systemui.statusbar.phone.NotificationPanelView>
 
</merge>