For #19886 use block color on disabled permissions

3 years ago · 215ef9d46b
parent 45daeb128a
commit 215ef9d46b
10 changed files with 22 additions and 16 deletions
--- a/app/src/main/res/drawable/ic_autoplay_disabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_disabled.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M3.326 4.265A0.83 0.83 0 0 1 3.225 4h-0.36C2.842 4 2.822 4.008 2.8 4.01a0.737 0.737 0 0 0-0.58 0.21 0.75 0.75 0 0 0 0 1.061l1.847 1.847A9.441 9.441 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5a9.42 9.42 0 0 0 4.879-1.36l1.64 1.64a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.326 4.265zM12.2 20c-4.411 0-8-3.589-8-8 0-1.328 0.352-2.609 0.975-3.764l4.301 4.301v3.026a0.89 0.89 0 0 0 1.333 0.773l1.569-0.897 3.601 3.601A7.918 7.918 0 0 1 12.2 20zM8 4.364L7.636 4H5.14L8 6.86V4.364zM12.2 4c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12a7.964 7.964 0 0 1-1.898 5.162l1.06 1.06A9.45 9.45 0 0 0 21.7 12a9.442 9.442 0 0 0-2.782-6.718A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5z" />
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M17.046 12.773a0.89 0.89 0 0 0 0-1.547L10.81 7.664a0.887 0.887 0 0 0-1.322 0.685l5.564 5.564 1.994-1.14z" />
 </vector>
--- a/app/src/main/res/drawable/ic_camera_disabled.xml
+++ b/app/src/main/res/drawable/ic_camera_disabled.xml
@ -9,6 +9,6 @@
    android:viewportHeight="24">
    <path
        android:name="icon"
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M17.28 19.72l-14-14a0.75 0.75 0 1 0-1.061 1.061L3 7.561V17a2.5 2.5 0 0 0 2.5 2.5h9.44l1.28 1.28a0.748 0.748 0 0 0 1.06 0 0.749 0.749 0 0 0 0-1.06zM5.3 18l-0.8-0.8V9.061L13.439 18H5.3zM15.5 6.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5v1.349l1.498 1.498L17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9c-0.396 0-0.766 0.101-1.099 0.265L5.636 6H14.7l0.8 0.8z" />
 </vector>
--- a/app/src/main/res/drawable/ic_link_disabled.xml
+++ b/app/src/main/res/drawable/ic_link_disabled.xml
@ -9,12 +9,12 @@
    android:viewportHeight="24">

    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" />
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M7.791 8.997l6.712 6.712a0.749 0.749 0 1 0 1.06-1.06L8.85 7.937a0.749 0.749 0 1 0-1.059 1.06z" />
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M7.974 13.42L3.65 9.096v-1.13L7.466 4.15h1.13l4.324 4.324a1.5 1.5 0 0 0 0-2.12L9.797 3.232a2.498 2.498 0 0 0-3.533 0L2.732 6.764a2.498 2.498 0 0 0 0 3.533l3.123 3.123a1.497 1.497 0 0 0 2.119 0z" />
 </vector>
--- a/app/src/main/res/drawable/ic_location_disabled.xml
+++ b/app/src/main/res/drawable/ic_location_disabled.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M3.78 5.22a0.75 0.75 0 1 0-1.061 1.061l1.318 1.318a8.367 8.367 0 0 0-0.535 3.105c0.081 3.397 4.401 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796 51.854 51.854 0 0 0 1.692-1.905l2.482 2.482a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.78 5.22zm9.171 14.959a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a6.917 6.917 0 0 1 0.219-1.886l9.447 9.447a48.709 48.709 0 0 1-1.718 1.949zM11.833 3.502c3.859-0.092 7.074 2.971 7.166 6.83 0.031 1.298-0.856 3.238-2.473 5.521l1.076 1.076c1.608-2.227 2.944-4.678 2.897-6.633-0.112-4.686-4.016-8.406-8.702-8.294A8.472 8.472 0 0 0 5.6 4.928L6.662 5.99a6.976 6.976 0 0 1 5.171-2.488z" />
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M10.152 9.48a2.245 2.245 0 0 1 1.794-0.978 2.246 2.246 0 0 1 1.327 4.099l1.062 1.062a3.734 3.734 0 0 0 1.413-3.003 3.754 3.754 0 0 0-3.839-3.659 3.728 3.728 0 0 0-2.821 1.415l1.064 1.064z" />
 </vector>
--- a/app/src/main/res/drawable/ic_microphone_disabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_disabled.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="@color/disabled_text"
+        android:fillColor="?primaryText"
        android:pathData="M20.78 19.72L4.28 3.22a0.75 0.75 0 1 0-1.061 1.061l5.787 5.787a2.992 2.992 0 0 0 2.926 2.926l1.312 1.312A4.32 4.32 0 0 1 12 14.5c-2.225 0-4.14-1.658-4.455-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.404 4.608 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.5a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.491-0.447a6.09 6.09 0 0 0 1.147-0.377l5.331 5.331a0.748 0.748 0 0 0 1.06 0 0.748 0.748 0 0 0 0.001-1.06zM10.5 6c0-0.827 0.673-1.5 1.5-1.5s1.5 0.673 1.5 1.5v4c0 0.107-0.012 0.211-0.034 0.312l1.142 1.142C14.851 11.022 15 10.531 15 10V6a3 3 0 0 0-3-3 2.993 2.993 0 0 0-2.986 2.859L10.5 7.345V6zm7.439 4.856a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636 4.43 4.43 0 0 1-0.763 1.894l1.066 1.066a5.808 5.808 0 0 0 1.182-2.747z" />
 </vector>
--- a/app/src/main/res/drawable/ic_notifications_disabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_disabled.xml
@ -9,8 +9,8 @@
        android:viewportHeight="24">
    <path
        android:pathData="M11.732,8.5h4.518a0.75,0.75 0,0 0,0 -1.5h-6.018l1.5,1.5zM3.28,2.22a0.75,0.75 0,1 0,-1.061 1.061L3.3,4.361c-0.18,0.343 -0.3,0.723 -0.3,1.139v9A2.5,2.5 0,0 0,5.5 17h5.036l5,4h1.607v-2.797l2.577,2.577a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.28,2.22zM15.643,19.165 L11.063,15.501L5.301,15.501l-0.8,-0.8v-9.14L9.939,11L7.75,11a0.75,0.75 0,0 0,0 1.5h3.689l4.203,4.203v2.462h0.001z"
-        android:fillColor="@color/disabled_text"/>
+        android:fillColor="?primaryText"/>
    <path
        android:pathData="M18.5,3H6.232l1.5,1.5H18.7l0.8,0.8v9.4l-0.784,0.784 1.122,1.122A2.494,2.494 0,0 0,21 14.5v-9A2.5,2.5 0,0 0,18.5 3z"
-        android:fillColor="@color/disabled_text"/>
+        android:fillColor="?primaryText"/>
 </vector>
--- a/app/src/main/res/drawable/ic_storage_disabled.xml
+++ b/app/src/main/res/drawable/ic_storage_disabled.xml
@ -9,8 +9,8 @@
    android:autoMirrored="true">
  <path
      android:pathData="M7.2,11h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z"
-      android:fillColor="@color/disabled_text"/>
+      android:fillColor="?primaryText"/>
  <path
      android:pathData="M3.78,2.22a0.75,0.75 0,1 0,-1.061 1.061L5.439,6H4.5A2.5,2.5 0,0 0,2 8.5v6A2.5,2.5 0,0 0,4.5 17h11.939l3.78,3.78a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.78,2.22zM4.3,15.5l-0.8,-0.8V8.3l0.8,-0.8h2.639l8,8H4.3zM19.5,6H9.691l1.5,1.5H19.7l0.8,0.8v6.4l-0.8,0.8h-0.509l1.296,1.296A2.499,2.499 0,0 0,22 14.5v-6A2.5,2.5 0,0 0,19.5 6z"
-      android:fillColor="@color/disabled_text"/>
+      android:fillColor="?primaryText"/>
 </vector>
--- a/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
@ -9,8 +9,8 @@
    android:viewportHeight="24">
    <path
        android:pathData="M3.53,3.22C3.237,2.927 2.762,2.927 2.469,3.22C2.176,3.513 2.176,3.988 2.469,4.281L4.069,5.881C3.158,6.571 2.698,7.719 2.909,8.872L3.617,12.717C3.888,14.198 4.386,15.493 5.095,16.567C6.525,18.736 8.496,20.547 10.647,21.669C11.066,21.885 11.534,22 12,22C12.468,22 12.937,21.885 13.355,21.667C14.687,20.972 15.944,20.007 17.051,18.862L19.47,21.281C19.616,21.427 19.808,21.501 20,21.501C20.192,21.501 20.384,21.428 20.53,21.281C20.823,20.988 20.823,20.513 20.53,20.22L3.53,3.22ZM12.663,20.337H11.339C9.412,19.332 7.639,17.7 6.347,15.74C5.75,14.836 5.327,13.727 5.092,12.445L4.338,8.368L4.844,7.131L5.154,6.965L15.993,17.804C14.995,18.841 13.861,19.711 12.663,20.337Z"
-        android:fillColor="@color/disabled_text"/>
+        android:fillColor="?primaryText"/>
    <path
        android:pathData="M19.533,5.683L13.431,2.36C12.535,1.881 11.462,1.881 10.564,2.364L6.795,4.378L7.907,5.49L11.516,3.556H12.495L19.054,7.128L19.664,8.368L18.911,12.455C18.701,13.59 18.336,14.58 17.84,15.423L18.936,16.519C19.628,15.457 20.118,14.183 20.386,12.729L21.091,8.937C21.334,7.622 20.707,6.313 19.533,5.683Z"
-        android:fillColor="@color/disabled_text"/>
+        android:fillColor="?primaryText"/>
 </vector>
--- a/app/src/main/res/layout/quicksettings_permissions.xml
+++ b/app/src/main/res/layout/quicksettings_permissions.xml
@ -23,6 +23,7 @@
        app:layout_constraintBottom_toTopOf="@id/microphoneLabel"
        app:layout_constraintEnd_toStartOf="@id/cameraStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <TextView
@ -48,6 +49,7 @@
        app:layout_constraintBottom_toTopOf="@id/notificationLabel"
        app:layout_constraintEnd_toStartOf="@id/microphoneStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <TextView
@ -73,6 +75,7 @@
        app:layout_constraintBottom_toTopOf="@id/locationLabel"
        app:layout_constraintEnd_toStartOf="@id/notificationStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <TextView
@ -98,6 +101,7 @@
        app:layout_constraintBottom_toTopOf="@id/persistentStorageLabel"
        app:layout_constraintEnd_toStartOf="@id/locationStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <TextView
@ -123,6 +127,7 @@
        app:layout_constraintBottom_toTopOf="@id/mediaKeySystemAccessLabel"
        app:layout_constraintEnd_toStartOf="@id/persistentStorageStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <TextView
@ -148,6 +153,7 @@
        app:layout_constraintBottom_toTopOf="@id/autoplayLabel"
        app:layout_constraintEnd_toStartOf="@id/mediaKeySystemAccessStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <TextView
@ -174,6 +180,7 @@
        app:layout_constraintBottom_toTopOf="@id/mediaKeySystemAccessLabel"
        app:layout_constraintEnd_toStartOf="@id/autoplayStatus"
        app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?primaryText"
        tools:visibility="visible" />

    <androidx.appcompat.widget.AppCompatSpinner
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -360,7 +360,6 @@
    <color name="private_browsing_button_accent_color">@color/foundation_private_theme</color>
    <color name="white_color">@color/photonLightGrey05</color>
    <color name="neutral_text">@color/white_color</color>
-    <color name="disabled_text">#cccccc</color>
    <color name="text_scale_example_text_color">#232749</color>
    <color name="sync_error_background_color">#FFF36E</color>
    <color name="sync_error_text_color">#960E18</color>