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

Commit 33747e75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable conversation strip" into rvc-dev am: c7063617 

Change-Id: I37dfc301febcd270dcdae7e872860ceae14e262a
parents 7545962c c7063617

packages/SystemUI/res/layout/people_strip.xml

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
            android:padding="8dp"

            android:scaleType="fitCenter"

            android:forceHasOverlappingRendering="false"

            android:visibility="gone"

        />



        <ImageView
@@ -65,6 +66,7 @@ 
            android:padding="8dp"

            android:scaleType="fitCenter"

            android:forceHasOverlappingRendering="false"

            android:visibility="gone"

        />



        <ImageView
@@ -73,6 +75,7 @@ 
            android:padding="8dp"

            android:scaleType="fitCenter"

            android:forceHasOverlappingRendering="false"

            android:visibility="gone"

        />



        <ImageView
@@ -81,6 +84,7 @@ 
            android:padding="8dp"

            android:scaleType="fitCenter"

            android:forceHasOverlappingRendering="false"

            android:visibility="gone"

        />



        <ImageView
@@ -89,6 +93,7 @@ 
            android:padding="8dp"

            android:scaleType="fitCenter"

            android:forceHasOverlappingRendering="false"

            android:visibility="gone"

        />



    </LinearLayout>

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java

+4 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 


    private static final String TAG = "NotifSectionsManager";

    private static final boolean DEBUG = false;

    private static final boolean ENABLE_SNOOZED_CONVERSATION_HUB = false;



    private final ActivityStarter mActivityStarter;

    private final StatusBarStateController mStatusBarStateController;
@@ -193,7 +194,9 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
            mPeopleHubSubscription.unsubscribe();

        }

        mPeopleHubView = reinflateView(mPeopleHubView, layoutInflater, R.layout.people_strip);

        if (ENABLE_SNOOZED_CONVERSATION_HUB) {

            mPeopleHubSubscription = mPeopleHubViewAdapter.bindView(mPeopleHubViewBoundary);

        }



        if (mMediaControlsView != null) {

            mKeyguardMediaPlayer.unbindView();