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

Merge "Fix colors in bubble settings so they're more visible" into udc-dev

Browse Source
This commit is contained in:
Mady Mellor
2023-06-08 17:35:55 +00:00
committed by Android (Google) Code Review
parent a34a510a40 f184678802
commit 8a47899369
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/drawable/button_border_selected.xml
View File

@@ -15,9 +15,12 @@
limitations under the License. limitations under the License.
--> -->
<shape 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"
android:shape="rectangle"> android:shape="rectangle">
<solid
android:color="?androidprv:attr/materialColorPrimaryContainer" />
<stroke <stroke
android:width="2dp" android:width="1dp"
android:color="?android:attr/colorAccent"/> android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
<corners android:radius="@dimen/rect_button_radius" /> <corners android:radius="@dimen/rect_button_radius" />
</shape> </shape>

4
res/drawable/button_border_unselected.xml
View File

@@ -15,10 +15,10 @@
limitations under the License. limitations under the License.
--> -->
<shape 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"
android:shape="rectangle"> android:shape="rectangle">
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="?android:attr/colorAccent"/> android:color="?androidprv:attr/materialColorOutlineVariant"/>
<corners android:radius="@dimen/rect_button_radius" /> <corners android:radius="@dimen/rect_button_radius" />
</shape> </shape>

7
src/com/android/settings/notification/app/BubblePreference.java
View File

@@ -167,9 +167,10 @@ public class BubblePreference extends Preference implements View.OnClickListener
: R.drawable.button_border_unselected)); : R.drawable.button_border_unselected));
mView.setSelected(selected); mView.setSelected(selected);
ColorStateList stateList = selected int colorResId = selected
? Utils.getColorAccent(context) ? com.android.internal.R.attr.materialColorOnPrimaryContainer
: Utils.getColorAttr(context, android.R.attr.textColorPrimary); : com.android.internal.R.attr.materialColorOnSurfaceVariant;
ColorStateList stateList = Utils.getColorAttr(context, colorResId);
mImageView.setImageTintList(stateList); mImageView.setImageTintList(stateList);
mTextView.setTextColor(stateList); mTextView.setTextColor(stateList);
} }