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

Commit 9553a1ec authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Visual refresh for QS"

parents f140121f 3250885c

packages/SettingsLib/src/com/android/settingslib/Utils.java

+25 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.net.ConnectivityManager;
@@ -170,10 +171,7 @@ public class Utils { 


    @ColorInt

    public static int getColorAccent(Context context) {

        TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});

        @ColorInt int colorAccent = ta.getColor(0, 0);

        ta.recycle();

        return colorAccent;

        return getColorAttr(context, android.R.attr.colorAccent);

    }



    @ColorInt
@@ -192,6 +190,29 @@ public class Utils { 
        return list.getDefaultColor();

    }



    @ColorInt

    public static int getDisabled(Context context, int inputColor) {

        return applyAlphaAttr(context, android.R.attr.disabledAlpha, inputColor);

    }



    @ColorInt

    public static int applyAlphaAttr(Context context, int attr, int inputColor) {

        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});

        float alpha = ta.getFloat(0, 0);

        ta.recycle();

        alpha *= Color.alpha(inputColor);

        return Color.argb((int) (alpha), Color.red(inputColor), Color.green(inputColor),

                Color.blue(inputColor));

    }



    @ColorInt

    public static int getColorAttr(Context context, int attr) {

        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});

        @ColorInt int colorAccent = ta.getColor(0, 0);

        ta.recycle();

        return colorAccent;

    }



    /**

     * Determine whether a package is a "system package", in which case certain things (like

     * disabling notifications or disabling the package altogether) should be disallowed.

packages/SystemUI/res/anim/ic_dnd_total_silence_disable_alpha_animation.xml

deleted100644 → 0
+0 −26
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.

-->

<set

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

    <objectAnimator

        android:duration="350"

        android:propertyName="alpha"

        android:valueFrom="1.0"

        android:valueTo="0.3"

        android:valueType="floatType"

        android:interpolator="@android:interpolator/linear" />

</set>

packages/SystemUI/res/anim/ic_hotspot_disable_animation_root.xml

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

<!--

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

-->

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

    <objectAnimator

        android:duration="350"

        android:propertyName="alpha"

        android:valueFrom="1.0"

        android:valueTo="0.3"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

</set>

packages/SystemUI/res/anim/ic_hotspot_enable_animation_root.xml

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

<!--

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

-->

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

    <objectAnimator

        android:duration="350"

        android:propertyName="alpha"

        android:valueFrom="0.3"

        android:valueTo="1.0"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

</set>

packages/SystemUI/res/anim/ic_invert_colors_disable_animation_root.xml

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

<!--

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

-->

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

    <objectAnimator

        android:duration="350"

        android:propertyName="alpha"

        android:valueFrom="1.0"

        android:valueTo="0.3"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

</set>