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

Commit 875727c2 authored by Jasper Chang's avatar Jasper Chang Committed by Android (Google) Code Review
Browse files

Merge "Create palette preview for color correction."

parents 263bc809 55668766

res/layout/daltonizer_preview.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2020 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

  -->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/preview_viewport"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <com.android.settings.accessibility.PaletteListView

        android:id="@+id/palette_listView"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:contentDescription="@null" />



</FrameLayout>

res/layout/palette_listview_item.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2020 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

  -->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <TextView

        android:id="@+id/item_textview"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="10dp"

        android:textSize="20dp"

        android:maxLength="20"

        android:singleLine="true"/>



</FrameLayout>

res/values-night/colors.xml

+11 −1
Original line number Diff line number Diff line
@@ -22,11 +22,21 @@ 
    <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>

    <color name="contextual_card_background">@*android:color/material_grey_900</color>

    <color name="search_bar_background">@*android:color/material_grey_800</color>

    <!-- Dialog background color -->

    <!-- Dialog background color. -->

    <color name="dialog_background">@*android:color/material_grey_800</color>

    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>

    <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->

    <color name="notification_importance_button_unselected">#5F6368</color>

    <color name="face_intro_outline">?android:attr/colorAccent</color>

    <!-- Palette list preference colors. -->

    <color name="palette_list_gradient_background">@android:color/black</color>

    <color name="palette_list_color_red">@color/palette_list_dark_mode_color_red</color>

    <color name="palette_list_color_orange">@color/palette_list_dark_mode_color_orange</color>

    <color name="palette_list_color_yellow">@color/palette_list_dark_mode_color_yellow</color>

    <color name="palette_list_color_green">@color/palette_list_dark_mode_color_green</color>

    <color name="palette_list_color_cyan">@color/palette_list_dark_mode_color_cyan</color>

    <color name="palette_list_color_blue">@color/palette_list_dark_mode_color_blue</color>

    <color name="palette_list_color_purple">@color/palette_list_dark_mode_color_purple</color>

    <color name="palette_list_color_pink">@color/palette_list_dark_mode_color_pink</color>

</resources>

res/values/arrays.xml

+42 −19
Original line number Diff line number Diff line
@@ -1469,4 +1469,27 @@ 
        <item>"com.google.android.googlequicksearchbox"</item>

    </string-array>



    <!-- Array of titles palette list for accessibility. -->

    <string-array name="setting_palette_colors" translatable="false" >

        <item>@string/color_red</item>

        <item>@string/color_orange</item>

        <item>@string/color_yellow</item>

        <item>@string/color_green</item>

        <item>@string/color_cyan</item>

        <item>@string/color_blue</item>

        <item>@string/color_purple</item>

        <item>@string/color_pink</item>

    </string-array>



    <!-- Values for palette list view preference. -->

    <array name="setting_palette_data" translatable="false" >

        <item>@color/palette_list_color_red</item>

        <item>@color/palette_list_color_orange</item>

        <item>@color/palette_list_color_yellow</item>

        <item>@color/palette_list_color_green</item>

        <item>@color/palette_list_color_cyan</item>

        <item>@color/palette_list_color_blue</item>

        <item>@color/palette_list_color_purple</item>

        <item>@color/palette_list_color_pink</item>

    </array>

</resources>
 
 No newline at end of file

res/values/colors.xml

+22 −0
Original line number Diff line number Diff line
@@ -148,4 +148,26 @@ 
    <color name="face_intro_outline">#ffdadce0</color>



    <color name="back_gesture_indicator">#4182ef</color>



    <!-- Palette list preference colors. -->

    <color name="palette_list_gradient_background">@android:color/white</color>

    <color name="palette_list_color_red">#d93025</color> <!-- Material Red 600 -->

    <color name="palette_list_color_orange">#e8710a</color> <!-- Material Orange 600 -->

    <color name="palette_list_color_yellow">#f9ab00</color> <!-- Material Yellow 600 -->

    <color name="palette_list_color_green">#1e8e3e</color> <!-- Material Green 600 -->

    <color name="palette_list_color_cyan">#12b5cb</color> <!-- Material Cyan 600 -->

    <color name="palette_list_color_blue">#1a73e8</color> <!-- Material Blue 600 -->

    <color name="palette_list_color_purple">#9334e6</color> <!-- Material Purple 600 -->

    <color name="palette_list_color_pink">#e52592</color> <!-- Material Pink 600 -->



    <!-- Palette list preference dark mode colors. -->

    <color name="palette_list_dark_mode_color_red">#f28b82</color> <!-- Material Red 300 -->

    <color name="palette_list_dark_mode_color_orange">#fcad70</color> <!-- Material Orange 300 -->

    <color name="palette_list_dark_mode_color_yellow">#fdd663</color> <!-- Material Yellow 300 -->

    <color name="palette_list_dark_mode_color_green">#81c995</color> <!-- Material Green 300 -->

    <color name="palette_list_dark_mode_color_cyan">#78d9ec</color> <!-- Material Cyan 300 -->

    <color name="palette_list_dark_mode_color_blue">#8AB4F8</color> <!-- Material Blue 300 -->

    <color name="palette_list_dark_mode_color_purple">#c58af9</color> <!-- Material Purple 300 -->

    <color name="palette_list_dark_mode_color_pink">#ff8bcb</color> <!-- Material Pink 300 -->



</resources>
 
 No newline at end of file