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

Commit 69352a9b authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents fd62e76e b3e277de

core/java/com/android/internal/app/ColorDisplayController.java

+2 −4
Original line number Diff line number Diff line
@@ -558,12 +558,10 @@ public final class ColorDisplayController { 
    }



    /**

     * Returns {@code true} if Night display is supported by the device,

     * unless LiveDisplay feature is available.

     * Returns {@code true} if Night display is supported by the device.

     */

    public static boolean isAvailable(Context context) {

        return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable) &&

                !context.getPackageManager().hasSystemFeature("org.lineageos.livedisplay");

        return context.getResources().getBoolean(R.bool.config_nightDisplayAvailable);

    }



    /**

packages/SystemUI/res/drawable/ic_qs_location_battery_saving.xml

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

    Copyright (C) 2017 The LineageOS Project

    Copyright (C) 2016 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="64dp"

        android:height="64dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M24.0,4.0c-7.7,0.0 -14.0,6.3 -14.0,14.0c0.0,10.5 14.0,26.0 14.0,26.0s14.0,-15.5 14.0,-26.0C38.0,10.3 31.7,4.0 24.0,4.0zM24.0,23.0c-2.8,0.0 -5.0,-2.2 -5.0,-5.0s2.2,-5.0 5.0,-5.0c2.8,0.0 5.0,2.2 5.0,5.0S26.8,23.0 24.0,23.0z"/>

    <path

        android:pathData="M24.0,4.0c-7.7,0.0 -14.0,6.3 -14.0,14.0c0.0,10.5 14.0,26.0 14.0,26.0l0.0,-21.0 c-2.8,0.0 -5.0,-2.2 -5.0,-5.0s2.2,-5.0 5.0,-5.0l0.0,-9.0z"

        android:fillColor="#FFFFFFFF"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_location_sensors_only.xml

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

    Copyright (C) 2017 The LineageOS Project

    Copyright (C) 2016 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="64dp"

        android:height="64dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M24.0,4.0c-7.7,0.0 -14.0,6.3 -14.0,14.0c0.0,10.5 14.0,26.0 14.0,26.0s14.0,-15.5 14.0,-26.0C38.0,10.3 31.7,4.0 24.0,4.0zM24.0,23.0c-2.8,0.0 -5.0,-2.2 -5.0,-5.0s2.2,-5.0 5.0,-5.0c2.8,0.0 5.0,2.2 5.0,5.0S26.8,23.0 24.0,23.0z"/>

    <path

        android:pathData="M24.0,4.0c-7.7,0.0 -14.0,6.3 -14.0,14.0c0.0,10.5 14.0,26.0 14.0,26.0l0.0,-21.0 c-2.8,0.0 -5.0,-2.2 -5.0,-5.0s2.2,-5.0 5.0,-5.0l0.0,-9.0z"

        android:fillColor="#4DFFFFFF"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_profiles.xml

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

<!--

    Copyright (c) 2015 The CyanogenMod Project

    Copyright (C) 2017-2018 The LineageOS 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="48dp"

    android:height="48dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19,5v14H5V5H19

M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3L19,3z

M17,8 c0-0.6-0.4-1-1-1c-0.6,0-1,0.4-1,1s0.4,1,1,1C16.6,9,17,8.6,17,8z

M13,8c0-0.6-0.4-1-1-1c-0.6,0-1,0.4-1,1s0.4,1,1,1 C12.6,9,13,8.6,13,8z

M9,8c0-0.6-0.4-1-1-1S7,7.4,7,8s0.4,1,1,1S9,8.6,9,8z

M17,13h-6v-2H9v2H7v2h2v2h2v-2h6V13z" />

</vector>

packages/SystemUI/res/drawable/qs_detail_background.xml

+3 −3
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ Copyright (C) 2014 The Android Open Source Project 
    limitations under the License.

-->

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

    <item android:drawable="@color/qs_detail_transition" />

    <item android:drawable="?android:attr/colorPrimary" />

    <item android:drawable="@drawable/qs_detail_background_transition" />

    <item android:drawable="@drawable/qs_detail_background_primary" />

</transition>