Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I2f7a279a54c7fd583e094d0725a25ce5487f34e2
This commit is contained in:
TreeHugger Robot
2020-03-31 20:10:11 +00:00
committed by Automerger Merge Worker
parent 1f30cd976c c70636175c
commit 4538577955
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/layout/people_strip.xml
View File

@@ -57,6 +57,7 @@
android:padding="8dp" android:padding="8dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:forceHasOverlappingRendering="false" android:forceHasOverlappingRendering="false"
android:visibility="gone"
/> />
<ImageView <ImageView
@@ -65,6 +66,7 @@
android:padding="8dp" android:padding="8dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:forceHasOverlappingRendering="false" android:forceHasOverlappingRendering="false"
android:visibility="gone"
/> />
<ImageView <ImageView
@@ -73,6 +75,7 @@
android:padding="8dp" android:padding="8dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:forceHasOverlappingRendering="false" android:forceHasOverlappingRendering="false"
android:visibility="gone"
/> />
<ImageView <ImageView
@@ -81,6 +84,7 @@
android:padding="8dp" android:padding="8dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:forceHasOverlappingRendering="false" android:forceHasOverlappingRendering="false"
android:visibility="gone"
/> />
<ImageView <ImageView
@@ -89,6 +93,7 @@
android:padding="8dp" android:padding="8dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:forceHasOverlappingRendering="false" android:forceHasOverlappingRendering="false"
android:visibility="gone"
/> />
</LinearLayout> </LinearLayout>

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

@@ -67,6 +67,7 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section
private static final String TAG = "NotifSectionsManager"; private static final String TAG = "NotifSectionsManager";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final boolean ENABLE_SNOOZED_CONVERSATION_HUB = false;
private final ActivityStarter mActivityStarter; private final ActivityStarter mActivityStarter;
private final StatusBarStateController mStatusBarStateController; private final StatusBarStateController mStatusBarStateController;
@@ -193,7 +194,9 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section
mPeopleHubSubscription.unsubscribe(); mPeopleHubSubscription.unsubscribe();
} }
mPeopleHubView = reinflateView(mPeopleHubView, layoutInflater, R.layout.people_strip); mPeopleHubView = reinflateView(mPeopleHubView, layoutInflater, R.layout.people_strip);
mPeopleHubSubscription = mPeopleHubViewAdapter.bindView(mPeopleHubViewBoundary); if (ENABLE_SNOOZED_CONVERSATION_HUB) {
mPeopleHubSubscription = mPeopleHubViewAdapter.bindView(mPeopleHubViewBoundary);
}
if (mMediaControlsView != null) { if (mMediaControlsView != null) {
mKeyguardMediaPlayer.unbindView(); mKeyguardMediaPlayer.unbindView();