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
Fixes: 79773433
Test: robotests
Test: visual
This commit is contained in:
Fan Zhang
2018-05-21 12:07:28 -07:00
parent b9659d352c
commit 71c402b152
7 changed files with 10 additions and 37 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/colorPrimary"/>
</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

14
res/layout/radio_info.xml
View File

@@ -107,7 +107,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- Preferred Network Type -->
<TextView
@@ -126,7 +126,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- Radio Power -->
<Switch android:id="@+id/radio_power"
@@ -172,7 +172,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- Ping stats -->
<Button android:id="@+id/ping_test"
@@ -202,7 +202,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- PPP Sent -->
<LinearLayout style="@style/entry_layout">
@@ -229,7 +229,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- Call Status -->
<LinearLayout style="@style/entry_layout">
@@ -253,7 +253,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- CellInfoListRate Selection -->
<!-- Location -->
@@ -290,7 +290,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#000000" />
android:background="?android:attr/listDivider" />
<!-- Launch OEM-specific Info/Settings Activity (if any) -->
<!-- Carrier Provisioning -->

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

@@ -31,9 +31,11 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.IconDrawableFactory;
import android.util.Log;

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