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

Commit bae059a8 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323



Change-Id: Ie07cd8e98461f59d1b9541591ee6f638f8579661
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4033cc7d 7ebdcf7b

res/drawable/volume_dialog_button_background_outline.xml

+17 −14
Original line number Diff line number Diff line
@@ -14,9 +14,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

  -->



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

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

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

       android:insetTop="6dp"

       android:insetBottom="6dp">

    <shape

           android:shape="rectangle">

        <stroke

            android:color="?androidprv:attr/colorAccentPrimaryVariant"
@@ -29,3 +31,4 @@ 
            android:bottom="8dp" />

        <solid android:color="@android:color/transparent" />

    </shape>

</inset>
 
 No newline at end of file

res/drawable/volume_dialog_button_background_solid.xml

+16 −13
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
     limitations under the License.

  -->



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

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

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

       android:shape="rectangle">

       android:insetTop="6dp"

       android:insetBottom="6dp">

    <shape android:shape="rectangle">

        <stroke

            android:color="@android:color/transparent"

            android:width="1dp"/>
@@ -29,3 +31,4 @@ 
            android:bottom="8dp" />

        <solid android:color="?androidprv:attr/colorAccentPrimary" />

    </shape>

</inset>
 
 No newline at end of file

res/layout/panel_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
                android:id="@+id/see_more"

                style="@style/PanelOptionRoundedOutlinedButton"

                android:layout_width="wrap_content"

                android:layout_height="36dp"

                android:layout_height="wrap_content"

                android:minWidth="0dp"

                android:text="@string/settings_button"/>
@@ -130,7 +130,7 @@ 
                android:id="@+id/done"

                style="@style/PanelOptionRoundedSolidButton"

                android:layout_width="wrap_content"

                android:layout_height="36dp"

                android:layout_height="wrap_content"

                android:minWidth="0dp"

                android:text="@string/done"/>

        </LinearLayout>