Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ec418f4 authored by Mill Chen's avatar Mill Chen Committed by Android (Google) Code Review
Browse files

Merge "Normalize the icons in Accessibility"

parents dd1a99eb 9703d79c

res/drawable/ic_color_inversion.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector android:height="192dp" android:viewportHeight="192.0"

    android:viewportWidth="192.0" android:width="192dp"

<vector android:height="32dp" android:viewportHeight="192.0"

    android:viewportWidth="192.0" android:width="32dp"

    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#546E7A" android:pathData="M37.2,173.6l-28.5,-90c-1.7,-5.8 0.3,-12 5,-15.6l73.6,-57.1c5.2,-4 12.5,-4 17.6,0.1L178.6,70c4.6,3.7 6.5,9.9 4.8,15.6l-28.5,88.2c-1.9,6.1 -7.4,10.2 -13.7,10.2H50.8C44.5,183.9 39,179.7 37.2,173.6z"/>

    <path android:fillAlpha="0.2" android:fillColor="#263238"

res/drawable/ic_daltonizer.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector android:height="192dp" android:viewportHeight="192.0"

    android:viewportWidth="192.0" android:width="192dp"

<vector android:height="32dp" android:viewportHeight="192.0"

    android:viewportWidth="192.0" android:width="32dp"

    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#00BCD4" android:pathData="M37.1,173.5l-28.5,-90c-1.7,-5.8 0.3,-12 5,-15.6l73.6,-57.1c5.2,-4 12.5,-4 17.6,0.1l73.8,58.9c4.6,3.7 6.5,9.9 4.8,15.6l-28.5,88.2c-1.9,6.1 -7.4,10.2 -13.7,10.2H50.8C44.5,183.8 39,179.6 37.1,173.5z"/>

    <path android:fillAlpha="0.2" android:fillColor="#263238"

src/com/android/settings/accessibility/AccessibilitySettings.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.accessibility; 


import static android.os.Vibrator.VibrationIntensity;



import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.app.admin.DevicePolicyManager;

import android.app.settings.SettingsEnums;
@@ -594,6 +596,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            preference.setKey(componentName.flattenToString());



            preference.setTitle(title);

            preference.setIconSize(ICON_SIZE_MEDIUM);

            Utils.setSafeIcon(preference, icon);

            final boolean serviceEnabled = enabledServices.contains(componentName);

            String description = info.loadDescription(getPackageManager());