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

Merge "Add Settings icons needed for theme overlaying." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 16:38:08 +00:00
committed by Android (Google) Code Review
parent 208c21d2c1 7b7d6888a2
commit 41f0a69b76
14 changed files with 79 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/drawable/ic_check_circle_green_24dp.xml → res/drawable/ic_arrow_back.xml
View File

@@ -1,7 +1,7 @@
<!--
Copyright (C) 2017 The Android Open Source Project
Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
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
@@ -14,12 +14,12 @@ Copyright (C) 2017 The Android Open Source Project
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#0F9D58"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10
,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
android:fillColor="@android:color/white"
android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />
</vector>

4
res/drawable/ic_battery_status_bad_24dp.xml
View File

@@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/batteryBadColor"
android:fillColor="@android:color/white"
android:pathData="M15,14l-2,0l0,2l-2,0l0,-2l-2,0l0,-2l2,0l0,-2l2,0l0,2l2,0z"/>
<path
android:fillColor="?attr/batteryBadColor"
android:fillColor="@android:color/white"
android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
</vector>

4
res/drawable/ic_battery_status_good_24dp.xml
View File

@@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/batteryGoodColor"
android:fillColor="@android:color/white"
android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
<path
android:fillColor="?attr/batteryGoodColor"
android:fillColor="@android:color/white"
android:pathData="M16.1,11.1l-1.4,-1.5l-3.9,3.9l-1.5,-1.4l-1.4,1.4l2.9,2.9z"/>
</vector>

4
res/drawable/ic_battery_status_maybe_24dp.xml
View File

@@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/batteryMaybeColor"
android:fillColor="@android:color/white"
android:pathData="M13,17h-2v-2h2V17zM13,13h-2V8h2V13z"/>
<path
android:fillColor="?attr/batteryMaybeColor"
android:fillColor="@android:color/white"
android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
</vector>

22
res/drawable/ic_cellular_1_bar.xml
View File

@@ -13,17 +13,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:pathData="M4,44h40V4z"
android:fillColor="#000000"
android:fillAlpha=".3"/>
<path
android:pathData="M24,24L4,44h20z"
android:fillColor="#000000"/>
<path
android:fillColor="#000000"
android:pathData="M20,7v13H7L20,7 M22,2L2,22h20V2L22,2z" />
<path
android:fillColor="#000000"
android:pathData="M 11 13 L 2 22 L 11 22 Z" />
</vector>

25
res/drawable/ic_devices_other_black.xml
View File

@@ -1,25 +0,0 @@
<!--
Copyright 2018 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:viewportWidth="24"
android:viewportHeight="24"
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/>
</vector>

57
res/drawable/ic_hotspot.xml
View File

@@ -15,48 +15,17 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:name="root"
android:alpha="1.0"
android:height="48dp"
android:width="48dp"
android:viewportHeight="48"
android:viewportWidth="48" >
<group
android:name="ic_hotspot"
android:translateX="23.9778"
android:translateY="24.26443" >
<group
android:name="ic_hotspot_pivot"
android:translateX="-23.21545"
android:translateY="-18.86649" >
<clip-path
android:name="mask"
android:pathData="M 38.8337860107,-40.3974914551 c 0.0,0.0 -38.4077911377,30.8523712158 -38.4077911377,30.8523712158 c 0.0,0.0 6.97125244141,7.33258056641 6.97125244141,7.33258056641 c 0.0,0.0 -2.4169921875,2.57838439941 -2.4169921875,2.57838439941 c 0.0,0.0 -6.77128601074,-6.82850646973 -6.77128601074,-6.82850646973 c 0.0,0.0 -32.6199798584,25.1699066162 -32.6199798584,25.1699066162 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 27.6589050293,-22.6579437256 27.6589050293,-22.6579437256 c 0.0,0.0 -30.8645172119,-34.00390625 -30.8645172119,-34.00390625 c 0.0,0.0 2.70756530762,-1.99278259277 2.70756530762,-1.99278259277 c 0.0,0.0 1.53030395508,-0.876571655273 1.53030395508,-0.876571655274 c 0.0,0.0 2.85780334473,-3.12069702148 2.85780334473,-3.12069702148 c 0.0,0.0 0.659332275391,0.664688110352 0.659332275391,0.664688110351 c 0.0,0.0 -3.13299560547,2.82977294922 -3.13299560547,2.82977294922 c 0.0,0.0 29.0108337402,34.4080963135 29.0108337402,34.4080963135 c 0.0,0.0 42.8175811768,-34.3554534912 42.8175811768,-34.3554534912 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
<group
android:name="cross" >
<path
android:name="cross_1"
android:pathData="M 4.44044494629,2.24310302734 c 0.0,0.0 0.0875396728516,0.112457275391 0.0875396728516,0.112457275391 "
android:strokeColor="#FFFFFFFF"
android:strokeAlpha="0"
android:strokeWidth="3.5"
android:fillColor="#00000000" />
</group>
<group
android:name="hotspot"
android:translateX="23.481"
android:translateY="18.71151" >
<group
android:name="circles"
android:translateX="-0.23909"
android:translateY="-0.10807" >
<path
android:name="path_3"
android:pathData="M -0.0042724609375,-2.64895629883 c -2.20922851562,0.0 -4.0,1.791015625 -4.0,4.0 c 0.0,2.20922851562 1.79077148438,4.0 4.0,4.0 c 2.208984375,0.0 4.0,-1.79077148438 4.0,-4.0 c 0.0,-2.208984375 -1.791015625,-4.0 -4.0,-4.0 Z M 11.9957275391,1.35104370117 c 0.0,-6.626953125 -5.373046875,-12.0 -12.0,-12.0 c -6.62719726562,0.0 -12.0,5.373046875 -12.0,12.0 c 0.0,4.43603515625 2.41381835938,8.30004882812 5.99194335938,10.3771972656 c 0.0,0.0 2.01586914062,-3.48217773438 2.01586914062,-3.48217773438 c -2.38500976562,-1.38500976562 -4.0078125,-3.93798828125 -4.0078125,-6.89501953125 c 0.0,-4.41796875 3.58178710938,-8.0 8.0,-8.0 c 4.41796875,0.0 8.0,3.58203125 8.0,8.0 c 0.0,2.95703125 -1.623046875,5.51000976562 -4.00805664062,6.89501953125 c 0.0,0.0 2.01586914062,3.48217773438 2.01586914062,3.48217773438 c 3.578125,-2.0771484375 5.9921875,-5.94116210938 5.9921875,-10.3771972656 Z M -0.0042724609375,-18.6489562988 c -11.0451660156,0.0 -20.0,8.9541015625 -20.0,20.0 c 0.0,7.39306640625 4.02099609375,13.8330078125 9.98779296875,17.2951660156 c 0.0,0.0 2.00219726562,-3.458984375 2.00219726562,-3.458984375 c -4.77319335938,-2.77001953125 -7.98999023438,-7.92211914062 -7.98999023438,-13.8361816406 c 0.0,-8.8369140625 7.16381835938,-16.0 16.0,-16.0 c 8.83595275879,0.0 16.0000152588,7.1630859375 16.0000152588,16.0 c 0.0,5.9140625 -3.21704101562,11.0661621094 -7.990234375,13.8361816406 c 0.0,0.0 2.00219726562,3.458984375 2.00219726563,3.458984375 c 5.966796875,-3.46215820312 9.98803710937,-9.90209960938 9.98803710938,-17.2951660156 c 0.0,-11.0458984375 -8.955078125,-20.0 -20.0000152588,-20.0 Z"
android:fillColor="#FFFFFFFF"
android:fillAlpha="1" />
</group>
</group>
</group>
</group>
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:pathData="M12,7c-3.31,0-6,2.69-6,6c0,1.66,0.68,3.15,1.76,4.24l1.42-1.42C8.45,15.1,8,14.11,8,13c0-2.21,1.79-4,4-4s4,1.79,4,4 c0,1.11-0.45,2.1-1.18,2.82l1.42,1.42C17.32,16.15,18,14.66,18,13C18,9.69,15.31,7,12,7z" />
<path
android:fillColor="#000000"
android:pathData="M12,3C6.48,3,2,7.48,2,13c0,2.76,1.12,5.26,2.93,7.07l1.41-1.41C4.9,17.21,4,15.21,4,13c0-4.42,3.58-8,8-8s8,3.58,8,8 c0,2.21-0.9,4.2-2.35,5.65l1.41,1.41C20.88,18.26,22,15.76,22,13C22,7.48,17.52,3,12,3z" />
<path
android:fillColor="#000000"
android:pathData="M12,11c-1.1,0-2,0.9-2,2c0,0.55,0.23,1.05,0.59,1.41C10.95,14.77,11.45,15,12,15s1.05-0.23,1.41-0.59 C13.77,14.05,14,13.55,14,13C14,11.9,13.1,11,12,11z" />
</vector>

1
res/drawable/ic_settings_home.xml
View File

@@ -21,5 +21,4 @@
android:tint="?android:attr/colorControlNormal">
<path android:fillColor="#FFFFFFFF"
android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
<path android:pathData="M0 0h24v24H0z" />
</vector>

16
res/drawable/ic_settings_print.xml
View File

@@ -15,8 +15,14 @@
limitations under the License.
-->
<!-- Pass through drawable to framework ic_settings_print. This is necessary because this drawable
is used in AndroidManifest.xml and aapt cannot find drawable reference from outside of Settings
apk. -->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@*android:drawable/ic_settings_print"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FF000000"
android:pathData="M19,8h-1V3H6v5H5c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6C22,9.34 20.66,8 19,8zM16,19H8v-4h8V19zM16,8H8V5h8V8zM18,12.5c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1s1,0.45 1,1S18.55,12.5 18,12.5z"/>
</vector>

4
res/values/attrs.xml
View File

@@ -166,10 +166,6 @@
<attr name="twoStateButtonPreferenceStyle" format="reference" />
<attr name="batteryGoodColor" format="color" />
<attr name="batteryBadColor" format="color" />
<attr name="batteryMaybeColor" format="color" />
<attr name="fingerprint_layout_theme" format="reference" />
<attr name="face_layout_theme" format="reference" />
<attr name="ic_menu_moreoverflow" format="reference" />

10
res/values/themes.xml
View File

@@ -28,6 +28,7 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="android:listPreferredItemHeight">72dip</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -53,11 +54,6 @@
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<!-- For battery status icons in -->
<item name="batteryGoodColor">@color/battery_good_color_light</item>
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_color_light</item>
<!-- For AppBarLayout -->
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorPrimaryVariant">@android:color/white</item>
@@ -192,10 +188,6 @@
<!-- action bar, needed for search bar icon tinting -->
<item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>
<!-- For battery status icons in -->
<item name="batteryGoodColor">@color/battery_good_color_light</item>
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_color_light</item>
<!-- Define this color for material design -->
<item name="colorPrimaryVariant">@android:color/white</item>
</style>

12
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
View File

@@ -16,11 +16,14 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.SparseIntArray;
import androidx.annotation.ColorInt;
import androidx.annotation.IdRes;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
@@ -151,6 +154,15 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
preference.setTitle(getTitle(context));
preference.setSummary(getSummary(context));
preference.setIcon(getIconId());
ColorStateList tint = getIconTint();
if (tint != null) {
preference.getIcon().setTintList(tint);
}
}
/** Returns the {@link ColorStateList} for tinting {@link #getIconId()} or null if none. */
protected @Nullable ColorStateList getIconTint() {
return null;
}
public boolean shouldShowDialog() {

8
src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Parcel;
import com.android.settings.R;
@@ -62,6 +63,13 @@ public class EarlyWarningTip extends BatteryTip {
: R.drawable.ic_battery_status_bad_24dp;
}
@Override
public ColorStateList getIconTint() {
return ColorStateList.valueOf(mState == StateType.HANDLED
? R.color.battery_maybe_color_light
: R.color.battery_bad_color_light);
}
@Override
public void updateState(BatteryTip tip) {
final EarlyWarningTip earlyWarningTip = (EarlyWarningTip) tip;

6
src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Parcel;
import android.os.Parcelable;
@@ -58,6 +59,11 @@ public class SummaryTip extends BatteryTip {
return R.drawable.ic_battery_status_good_24dp;
}
@Override
public ColorStateList getIconTint() {
return ColorStateList.valueOf(R.color.battery_good_color_light);
}
@Override
public void updateState(BatteryTip tip) {
mState = tip.mState;