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

Misc GAR fixes

Browse Source 
- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual
This commit is contained in:
Fan Zhang
2018-05-21 12:07:28 -07:00
parent 76a0ef6adb
commit 3ab53bbd7b
7 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/drawable/selectable_card_grey.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:drawable="?android:attr/colorSecondary"/>
</ripple>

1
res/layout/battery_header.xml
View File

@@ -24,7 +24,6 @@
android:orientation="horizontal"
android:paddingTop="24dp"
android:paddingBottom="24dp"
android:background="@drawable/selectable_card_grey"
style="@style/EntityHeader">
<LinearLayout

3
res/layout/data_usage_summary_preference.xml
View File

@@ -23,7 +23,6 @@
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical"
android:background="@drawable/selectable_card_grey"
android:selectable="false"
style="@style/EntityHeader">
@@ -31,7 +30,7 @@
android:id="@+id/usage_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?android:attr/colorAccent"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/data_usage_title" />
<com.android.settings.datausage.MeasurableLinearLayout

2
res/values/styles.xml
View File

@@ -412,7 +412,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

@@ -318,7 +318,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);

3
tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
View File

@@ -1,7 +1,6 @@
package com.android.settings.testutils.shadow;
import static android.util.TypedValue.TYPE_REFERENCE;
import static org.robolectric.RuntimeEnvironment.application;
import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.shadow.api.Shadow.directlyOn;
@@ -122,8 +121,6 @@ public class SettingsShadowResources extends ShadowResources {
id = R.drawable.ic_settings_wireless;
} else if (id == R.drawable.app_filter_spinner_background) {
id = R.drawable.ic_expand_more_inverse;
} else if (id == R.drawable.selectable_card_grey) {
id = R.drawable.ic_expand_more_inverse;
}
return super.loadDrawable(value, id, theme);
}

2
tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
View File

@@ -50,8 +50,6 @@ public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
id = R.drawable.ic_settings_wireless;
} else if (id == R.drawable.app_filter_spinner_background) {
id = R.drawable.ic_expand_more_inverse;
} else if (id == R.drawable.selectable_card_grey) {
id = R.drawable.ic_expand_more_inverse;
} else if (id == R.drawable.color_bar_progress
|| id == R.drawable.ring_progress) {
// color_bar_progress and ring_progress use hidden resources, so just use the regular