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

Commit 1f240e8c authored by Michael Bestas's avatar Michael Bestas
Browse files

GlobalActions: Misc power menu cleanup 

* Update drawable size to match AOSP icons
* Update airplane mode drawables
* Remove unused changes to modes we don't use
* Remove dead code
* Cleanup based on lineage-15.1 bringup comments

Change-Id: I59b7246857acd34d18baaedc286a66820560fa49
parent 8344a15d

core/res/res/drawable/ic_lock_settings.xml→core/res/res/drawable/ic_lock_airplane_mode_disabled.xml

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

<!--

     Copyright (C) 2014 The Android Open Source Project

     Copyright (C) 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.
@@ -15,13 +15,15 @@ 
     limitations under the License.

-->

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

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="@color/white"

        android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z" />

        android:fillColor="#FF000000"

        android:pathData="M13 9V3.5c0-.83-.67-1.5-1.5-1.5S10 2.67 10 3.5v3.68l7.83 7.83L21 16v-2l-8-5zM3

5.27l4.99 4.99L2 14v2l8-2.5V19l-2 1.5V22l3.5-1 3.5 1v-1.5L13 19v-3.73L18.73 21

20 19.73 4.27 4 3 5.27z" />

</vector>

core/res/res/drawable/ic_lock_airplane_mode_enabled.xml

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

<!--

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

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#FF000000"

        android:pathData="M10.18 9" />

    <path

        android:fillColor="#FF000000"

        android:pathData="M21 16v-2l-8-5V3.5c0-.83-.67-1.5-1.5-1.5S10 2.67 10 3.5V9l-8 5v2l8-2.5V19l-2

1.5V22l3.5-1 3.5 1v-1.5L13 19v-5.5l8 2.5z" />

</vector>

core/res/res/drawable/ic_lock_lock.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


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

    android:src="@drawable/ic_lock_lock_alpha"

    android:tint="?attr/colorControlNormal" />
 
    android:tint="?attr/colorControlActivated" />

core/res/res/drawable/ic_lock_screenshot.xml

+6 −5
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ 
     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="28dp"

    android:height="28dp"

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">



    <path android:fillColor="#FF000000" android:pathData="M17,19H7V5H17M17,1H7C5.89,1 5,1.89 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3C19,1.89 18.1,1 17,1Z" />

    <path

        android:fillColor="#FF000000"

        android:pathData="M17,19H7V5H17M17,1H7C5.89,1 5,1.89 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3C19,1.89 18.1,1 17,1Z" />

</vector>

core/res/res/values/cm_dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
-->

<resources>

    <!-- Largest size an avatar might need to be drawn in the power menu user picker -->

    <dimen name="global_actions_avatar_size">32dp</dimen>

    <dimen name="global_actions_avatar_size">24dp</dimen>

</resources>