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

Commit d2be14a1 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Color transforms for the tuner"

parents c3bf8225 d40328e6

core/java/com/android/internal/logging/MetricsLogger.java

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public class MetricsLogger implements MetricsConstants { 
    public static final int ACTION_ZEN_ALLOW_LIGHTS = 262;

    public static final int NOTIFICATION_TOPIC_NOTIFICATION = 263;

    public static final int ACTION_DEFAULT_SMS_APP_CHANGED = 264;

    public static final int QS_COLOR_MATRIX = 265;



    /**

     * Logged when the user docks a window from recents by longpressing a task and dragging it to

packages/SystemUI/res/drawable/ic_colorize.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2015 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:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0.0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3.0,16.25L3.0,21.0l4.75,0.0l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,0.0 0.4,-1.0 0.01,-1.42zM6.92,19.0L5.0,17.08l8.06,-8.06 1.92,1.92L6.92,19.0z"/>

</vector>

packages/SystemUI/res/layout/preference_matrix.xml

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

<!--

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

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal">

    <Space

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1" />

    <GridLayout

        android:id="@+id/edit_group"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:rowCount="5"

        android:columnCount="5">



        <Space android:layout_width="40dp" />



        <TextView

            android:layout_width="40dp"

            android:text="@string/color_modification_r"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />



        <TextView

            android:layout_width="40dp"

            android:text="@string/color_modification_g"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />



        <TextView

            android:layout_width="40dp"

            android:text="@string/color_modification_b"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />



        <Space android:layout_width="40dp" />



        <TextView

            android:layout_width="40dp"

            android:text="@string/color_modification_r"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />



        <TextView

            android:layout_width="40dp"

            android:text="@string/color_modification_g"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />



        <TextView

            android:layout_width="40dp"

            android:text="@string/color_modification_b"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />



        <Space android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />

        <EditText android:inputType="numberDecimal" android:layout_width="40dp" />



    </GridLayout>

    <Button

        android:id="@+id/apply"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="bottom"

        android:text="@string/color_apply" />

</LinearLayout>

packages/SystemUI/res/layout/preference_widget_settings.xml

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

<!--

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

-->



<LinearLayout

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

    android:layout_height="wrap_content"

    android:layout_width="wrap_content">



    <RadioButton

        android:id="@+id/radio_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="4dp"

        android:clickable="false"

        android:focusable="false" />



    <View

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:background="?android:attr/listDivider" />



    <ImageView

        android:id="@+id/widget_icon"

        android:layout_width="50dp"

        android:layout_height="24dp"

        android:tint="@android:color/black"

        android:src="@drawable/ic_settings"

        android:layout_gravity="center_vertical" />



</LinearLayout>

packages/SystemUI/res/layout/preference_widget_switch.xml

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

<!--

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

-->



<LinearLayout

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

    android:layout_height="wrap_content"

    android:layout_width="wrap_content">



    <RadioButton

        android:id="@+id/radio_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:clickable="false"

        android:focusable="false"

        android:layout_marginEnd="4dp" />



    <View

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:background="?android:attr/listDivider" />



    <Switch

        android:id="@*android:id/switch_widget"

        android:layout_width="50dp"

        android:layout_height="wrap_content"

        android:focusable="false"

        android:clickable="false"

        android:background="@null" />



</LinearLayout>