Merge "Add missing conversation field" into udc-dev am: 2494fd0187
am: f448aec29d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257 Change-Id: I2832cdad7f91b61abca77691f2fbaa183b47c153 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -96,4 +96,11 @@
|
||||
android:summary="@string/demote_conversation_summary"
|
||||
settings:allowDividerAbove="true"/>
|
||||
|
||||
<!-- only used in ChannelPanelActivity -->
|
||||
<Preference
|
||||
android:key="convo_promote"
|
||||
android:icon="@drawable/ic_promote_conversation"
|
||||
android:title="@string/promote_conversation_title"
|
||||
android:summary="@string/promote_conversation_summary" />
|
||||
|
||||
</PreferenceScreen>
|
||||
|
Reference in New Issue
Block a user