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

Commit 2c543997 authored by Colin Cross's avatar Colin Cross
Browse files

resolve merge conflicts of f95418e0 to master 

Change-Id: If2b4d34b3ba64f61214b72fd71f8767500e68a53
parents b567b271 f95418e0

core/java/android/view/WindowManagerPolicy.java

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ public interface WindowManagerPolicy { 
        public void switchInputMethod(boolean forwardDirection);



        public void shutdown(boolean confirm);

        public void reboot(boolean confirm);

        public void rebootSafeMode(boolean confirm);



        /**

core/res/res/drawable/ic_lock_power_off.xml

+21 −15
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) 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.
@@ -13,7 +13,13 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->



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

    android:src="@drawable/ic_lock_power_off_alpha"

    android:tint="?attr/colorControlNormal" />
 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M13.0,3.0l-2.0,0.0l0.0,10.0l2.0,0.0L13.0,3.0zm4.83,2.17l-1.42,1.42C17.99,7.86 19.0,9.81 19.0,12.0c0.0,3.87 -3.13,7.0 -7.0,7.0s-7.0,-3.13 -7.0,-7.0c0.0,-2.19 1.01,-4.14 2.58,-5.42L6.17,5.17C4.23,6.82 3.0,9.26 3.0,12.0c0.0,4.97 4.03,9.0 9.0,9.0s9.0,-4.03 9.0,-9.0c0.0,-2.74 -1.23,-5.18 -3.17,-6.83z"/>

</vector>

core/res/res/drawable/ic_restart.xml

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

    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="24.0dp"

        android:height="24.0dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12.0,4.0L12.0,1.0L8.0,5.0l4.0,4.0L12.0,6.0c3.9,0.0 7.0,3.1 7.0,7.0c0.0,3.9 -3.1,7.0 -7.0,7.0l0.0,2.0c5.0,0.0 9.0,-4.0 9.0,-9.0C21.0,8.0 17.0,4.0 12.0,4.0z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M5.0,12.9C5.0,11.0 5.8,9.2 7.2,7.9L5.8,6.4C4.0,8.1 3.0,10.5 3.0,12.9c0.0,4.0 2.7,7.6 6.5,8.7l0.5,-1.9C7.1,18.8 5.0,16.1 5.0,12.9z"/>

</vector>

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2091,9 +2091,11 @@ 
         "bugreport" = Take bug report, if available

         "silent" = silent mode

         "users" = list of users

         "restart" = restart device

         -->

    <string-array translatable="false" name="config_globalActionsList">

        <item>power</item>

        <item>restart</item>

        <item>bugreport</item>

        <item>users</item>

    </string-array>

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -484,6 +484,10 @@ 
    <!-- label for item that turns off power in phone options dialog -->

    <string name="global_action_power_off">Power off</string>



    <!-- label for item that restarts phone in phone options dialog -->

    <!-- TODO: promote to separate string-->

    <string name="global_action_restart" translatable="false">@string/sim_restart_button</string>



    <!-- label for item that generates a bug report in the phone options dialog -->

    <string name="global_action_bug_report">Bug report</string>