PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie07cd8e98461f59d1b9541591ee6f638f8579661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shaowei Shen
2022-11-03 02:42:26 +00:00
committed by Automerger Merge Worker
parent 4033cc7d0e 7ebdcf7b14
commit bae059a834
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/volume_dialog_button_background_outline.xml
View File

@@ -14,9 +14,11 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:insetTop="6dp"
android:insetBottom="6dp">
<shape
android:shape="rectangle"> android:shape="rectangle">
<stroke <stroke
android:color="?androidprv:attr/colorAccentPrimaryVariant" android:color="?androidprv:attr/colorAccentPrimaryVariant"
@@ -28,4 +30,5 @@
android:top="8dp" android:top="8dp"
android:bottom="8dp" /> android:bottom="8dp" />
<solid android:color="@android:color/transparent" /> <solid android:color="@android:color/transparent" />
</shape> </shape>
</inset>

9
res/drawable/volume_dialog_button_background_solid.xml
View File

@@ -15,9 +15,11 @@
limitations under the License. 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" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:insetTop="6dp"
android:insetBottom="6dp">
<shape android:shape="rectangle">
<stroke <stroke
android:color="@android:color/transparent" android:color="@android:color/transparent"
android:width="1dp"/> android:width="1dp"/>
@@ -28,4 +30,5 @@
android:top="8dp" android:top="8dp"
android:bottom="8dp" /> android:bottom="8dp" />
<solid android:color="?androidprv:attr/colorAccentPrimary" /> <solid android:color="?androidprv:attr/colorAccentPrimary" />
</shape> </shape>
</inset>

4
res/layout/panel_layout.xml
View File

@@ -117,7 +117,7 @@
android:id="@+id/see_more" android:id="@+id/see_more"
style="@style/PanelOptionRoundedOutlinedButton" style="@style/PanelOptionRoundedOutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="wrap_content"
android:minWidth="0dp" android:minWidth="0dp"
android:text="@string/settings_button"/> android:text="@string/settings_button"/>
@@ -130,7 +130,7 @@
android:id="@+id/done" android:id="@+id/done"
style="@style/PanelOptionRoundedSolidButton" style="@style/PanelOptionRoundedSolidButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="wrap_content"
android:minWidth="0dp" android:minWidth="0dp"
android:text="@string/done"/> android:text="@string/done"/>
</LinearLayout> </LinearLayout>