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

Commit 73ba8609 authored by Aran Ink's avatar Aran Ink Committed by android-build-merger
Browse files

Merge "Change GlobalActions emergency icon to star of life." into qt-dev 

am: 2f86e743

Change-Id: Iedbc1fd9a8d8592cd2cc0d0f4de2769d729da9f4
parents 1921d330 2f86e743

packages/SystemUI/res/drawable/ic_emergency_star.xml

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

<!--

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

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M9.321,2l0,5.359l-4.641,-2.68l-2.68,4.641l4.641,2.679l-4.641,2.68l2.68,4.641l4.641,-2.68l0,5.359l5.359,0l0,-5.359l4.641,2.68l2.68,-4.641l-4.641,-2.68l4.641,-2.679l-2.68,-4.641l-4.641,2.679l0,-5.359z"

        android:strokeColor="#00000000"

        android:fillColor="#EA4335"

        android:strokeWidth="1"/>

</vector>

packages/SystemUI/res/layout-land/global_actions_column.xml

+8 −8
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ 
            android:orientation="horizontal"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

            android:background="?android:attr/colorBackgroundFloating"

        />

        <!-- For separated items-->
@@ -55,10 +55,10 @@ 
            android:layout_height="wrap_content"

            android:layout_marginLeft="@dimen/global_actions_grid_side_margin"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

            android:orientation="horizontal"

            android:background="?android:attr/colorBackgroundFloating"

            android:translationZ="@dimen/global_actions_translate"

packages/SystemUI/res/layout-land/global_actions_column_seascape.xml

+8 −8
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ 
            android:orientation="horizontal"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

            android:background="?android:attr/colorBackgroundFloating"

        />

        <!-- For separated items-->
@@ -55,10 +55,10 @@ 
            android:layout_height="wrap_content"

            android:layout_marginRight="@dimen/global_actions_grid_side_margin"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

            android:orientation="horizontal"

            android:background="?android:attr/colorBackgroundFloating"

            android:translationZ="@dimen/global_actions_translate"

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 


    private class EmergencyDialerAction extends EmergencyAction {

        private EmergencyDialerAction() {

            super(R.drawable.ic_faster_emergency,

            super(com.android.systemui.R.drawable.ic_emergency_star,

                    R.string.global_action_emergency);

        }