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

Merge "Vertical-center bubble preference button content" into rvc-qpr-dev am: 4d1ded8fba am: 3dc91fbf3a

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

Change-Id: I8fd955d2601b04093ec16afe63b269b18b7b4388
This commit is contained in:
Lyn Han
2020-07-09 17:28:05 +00:00
committed by Automerger Merge Worker
parent 8a2468447b 3dc91fbf3a
commit 3d1e9c2ea1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/bubble_preference.xml
View File

@@ -44,7 +44,7 @@
android:id="@+id/bubble_all_icon" android:id="@+id/bubble_all_icon"
android:src="@drawable/ic_bubble_all" android:src="@drawable/ic_bubble_all"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_gravity="center" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
@@ -53,6 +53,7 @@
android:id="@+id/bubble_all_label" android:id="@+id/bubble_all_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:clickable="false" android:clickable="false"
@@ -75,7 +76,7 @@
android:id="@+id/bubble_selected_icon" android:id="@+id/bubble_selected_icon"
android:src="@drawable/ic_bubble_selected" android:src="@drawable/ic_bubble_selected"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_gravity="center" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
@@ -84,6 +85,7 @@
android:id="@+id/bubble_selected_label" android:id="@+id/bubble_selected_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:clickable="false" android:clickable="false"
@@ -106,7 +108,7 @@
android:id="@+id/bubble_none_icon" android:id="@+id/bubble_none_icon"
android:src="@drawable/ic_bubble_none" android:src="@drawable/ic_bubble_none"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_gravity="center" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
@@ -115,6 +117,7 @@
android:id="@+id/bubble_none_label" android:id="@+id/bubble_none_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:clickable="false" android:clickable="false"
@@ -125,4 +128,4 @@
android:text="@string/bubble_app_setting_none"/> android:text="@string/bubble_app_setting_none"/>
</com.android.settings.notification.NotificationButtonRelativeLayout> </com.android.settings.notification.NotificationButtonRelativeLayout>
</LinearLayout> </LinearLayout>