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

Merge "Use colorPrimary for EntityHeader's background."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-31 06:15:37 +00:00
committed by Android (Google) Code Review
parent 1a509e4af9 aab7756f08
commit 94bc86c12a
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/drawable/selectable_card_grey.xml
View File

@@ -18,5 +18,5 @@
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:drawable="?android:attr/colorSecondary"/>
<item android:drawable="?android:attr/colorPrimary"/>
</ripple>

2
res/layout/storage_summary_donut.xml
View File

@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/colorSecondary"
android:background="?android:attr/colorPrimary"
android:gravity="center_vertical"
android:orientation="horizontal" >

2
res/values/styles.xml
View File

@@ -402,7 +402,7 @@
</style>
<style name="EntityHeader">
<item name="android:background">?android:attr/colorSecondary</item>
<item name="android:background">?android:attr/colorPrimary</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:paddingTop">16dp</item>
<item name="android:paddingStart">16dp</item>

2
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -307,7 +307,7 @@ public class EntityHeaderController {
return this;
}
actionBar.setBackgroundDrawable(
new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimary)));
actionBar.setElevation(0);
if (mRecyclerView != null && mLifecycle != null) {
ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);