Merge "Fix themed settings icons." into qt-dev (1c3d7aa1) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_menu_add.xml→res/drawable/ic_arrow_down_24dp.xml

+7 −11

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2015 The Android Open Source Project
		<!-- Copyright (C) 2019 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.
		@@ -14,15 +13,12 @@
		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="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlNormal">
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FF000000"
		android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0
		c0.55,0,1,0.45,1,1v5h5c0.55,0,1,0.45,1,1v0C19,12.55,18.55,13,18,13z"/>
		android:fillColor="?android:attr/colorControlNormal"
		android:pathData="M12,16.41l-6.71,-6.7l1.42,-1.42l5.29,5.3l5.29,-5.3l1.42,1.42z"/>
		</vector>

+4 −12

Original line number	Diff line number	Diff line
		@@ -14,15 +14,7 @@
		~ 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="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlActivated">
		<path
		android:fillColor="#FF000000"
		android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0
		c0.55,0,1,0.45,1,1v5h5c0.55,0,1,0.45,1,1v0C19,12.55,18.55,13,18,13z"/>
		</vector>
		<com.android.settings.widget.TintDrawable
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:drawable="@drawable/ic_add_24dp"
		android:tint="?android:attr/colorControlActivated" />
		No newline at end of file

+5 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM11.75,6.1c-0.5,0 -0.75,0.32 -0.75,0.72L11,13l4.64,2.78c0.34,0.2 0.78,0.1 0.98,-0.24a0.71,0.71 0,0 0,-0.25 -0.99l-3.87,-2.3L12.5,6.82c0,-0.4 -0.25,-0.72 -0.75,-0.72z"/>
		android:fillColor="@android:color/white"
		android:pathData="M11.99,2.0C6.47,2.0 2.0,6.48 2.0,12.0s4.47,10.0 9.99,10.0C17.52,22.0 22.0,17.52 22.0,12.0S17.52,2.0 11.99,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.58 -8.0,-8.0s3.58,-8.0 8.0,-8.0 8.0,3.58 8.0,8.0 -3.58,8.0 -8.0,8.0z"/>
		<path
		android:fillColor="@android:color/white"
		android:pathData="M12.5,7.0L11.0,7.0l0.0,6.0l5.25,3.1 0.75,-1.23 -4.5,-2.67z"/>
		</vector>

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,6 @@
		<item
		android:id="@+id/vpn_create"
		android:title="@string/vpn_create"
		android:icon="@drawable/ic_menu_add"
		android:icon="@drawable/ic_add_24dp"
		android:showAsAction="always" />
		</menu>

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +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="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>

		<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
		<item name="face_layout_theme">@style/FaceLayoutTheme</item>