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

Commit b784e6ea authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Update styling for channel half sheet" into udc-dev am: ee9fd903 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21553698



Change-Id: I2f764f2d171efdbcea07da4142779f9de315e5a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bba1e64a ee9fd903

packages/SystemUI/res/layout/notif_half_shelf.xml

+6 −3
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ 
                    android:layout_height="48dp"

                    android:layout_width="wrap_content"

                    android:layout_gravity="center_vertical"

                    android:padding="8dp" />

                    android:padding="8dp"

                    android:track="@drawable/settingslib_track_selector"

                    android:thumb="@drawable/settingslib_thumb_selector"

                    android:theme="@style/MainSwitch.Settingslib"/>

            </com.android.systemui.statusbar.notification.row.AppControlView>



            <!-- ChannelRows get added dynamically -->
@@ -101,7 +104,7 @@ 
                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

                android:maxWidth="200dp"

                style="@style/TextAppearance.NotificationInfo.Button"/>

                style="@style/Widget.Dialog.Button"/>

            <TextView

                android:id="@+id/done_button"

                android:text="@string/inline_ok_button"
@@ -113,7 +116,7 @@ 
                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

                android:layout_alignParentEnd="true"

                style="@style/TextAppearance.NotificationInfo.Button"/>

                style="@style/Widget.Dialog.Button"/>

        </RelativeLayout>

    </LinearLayout>

</FrameLayout>

packages/SystemUI/res/layout/notif_half_shelf_row.xml

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ 
            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical"

            android:padding="8dp"

            android:track="@drawable/settingslib_track_selector"

            android:thumb="@drawable/settingslib_thumb_selector"

            android:theme="@style/MainSwitch.Settingslib"

        />

    </LinearLayout>

</com.android.systemui.statusbar.notification.row.ChannelRow>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ class ChannelEditorDialogController @Inject constructor( 
            or WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)

}



class ChannelEditorDialog(context: Context) : Dialog(context) {

class ChannelEditorDialog(context: Context, theme: Int) : Dialog(context, theme) {

    fun updateDoneButtonText(hasChanges: Boolean) {

        findViewById<TextView>(R.id.done_button)?.setText(

                if (hasChanges)
@@ -361,7 +361,7 @@ class ChannelEditorDialog(context: Context) : Dialog(context) { 
        }



        fun build(): ChannelEditorDialog {

            return ChannelEditorDialog(context)

            return ChannelEditorDialog(context, R.style.Theme_SystemUI_Dialog)

        }

    }

}