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

Commit d1433cb0 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Refactor PanelView and NotificationPanelView into Controllers."""

parents 50298f75 af8163f7

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

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



    public static boolean isEnabled(Context ctx) {

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

        return getInstance(ctx).isEnabled();

    }



    public boolean isEnabled() {

        return Build.IS_DEBUGGABLE && 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"/>



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

    <include layout="@layout/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();



        mNotificationPanel.setScrollingEnabled(true);

        mNotificationPanelViewController.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

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

-->



<merge



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

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

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

    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">

    <FrameLayout

        android:id="@+id/big_clock_container"

        android:layout_width="match_parent"
@@ -97,4 +102,4 @@ 
        android:background="@drawable/qs_navbar_scrim" />



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

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