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

Commit 42bae1bf authored by Leo Hsu's avatar Leo Hsu Committed by Android (Google) Code Review
Browse files

Merge changes from topics "emergency-dialer-metrics",... 

Merge changes from topics "emergency-dialer-metrics", "telecom-metrics-for-emergency-dialer", "add_faster_emergency_dialer_flag" into pi-dev

* changes:
  Add extra data when starting emergency dialer intent
  Add new telecom metrics for emergency dialer
  Add new metrics constants for emergency dialer
  Separated emergency option final UI
  Fix Power menu background vanish
  Add separated emergency option on power menu
  Add emergency dialer option on power menu
parents 58c7bcf1 37768436

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -11235,6 +11235,14 @@ public final class Settings { 
         */

        public static final String EMERGENCY_AFFORDANCE_NEEDED = "emergency_affordance_needed";













        /**













         * Enable faster emergency phone call feature.













         * The value is a boolean (1 or 0).













         * @hide













         */













        public static final String FASTER_EMERGENCY_PHONE_CALL_ENABLED =













                "faster_emergency_phone_call_enabled";



























        /**















         * See RIL_PreferredNetworkType in ril.h















         * @hide

































core/res/res/drawable/emergency_icon.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -18,7 +18,7 @@ Copyright (C) 2014 The Android Open Source Project













        android:height="24.0dp"















        android:viewportWidth="24.0"















        android:viewportHeight="24.0"













        android:tint="?attr/colorControlNormal">













        android:tint="?attr/colorError">















    <path















        android:fillColor="#FF000000"















        android:pathData="M6.8,17.3C5.3,15.9 4.5,14.0 4.5,12.0c0.0,-2.0 0.8,-3.8 2.1,-5.2l1.4,1.4c-1.0,1.0 -1.6,2.4 -1.6,3.8c0.0,1.5 0.6,2.9 1.6,3.9L6.8,17.3z"/>

































core/res/res/drawable/ic_faster_emergency.xml
0 → 100644



+31
−0




























Original line number
Diff line number
Diff line













<!--













Copyright (C) 2018 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:viewportWidth="24.0"













        android:viewportHeight="24.0"













        android:tint="?attr/colorError">













    <path













        android:fillColor="#FF000000"













        android:pathData="M19,3H5C3.9,3,3.01,3.9,3.01,5L3,19c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z M19,19L5,19V5h14V19z" />













    <path













        android:fillColor="#FF000000"













        android:pathData="M 10.5 17 L 13.5 17 L 13.5 13.5 L 17 13.5 L 17 10.5 L 13.5 10.5 L 13.5 7 L 10.5 7 L 10.5 10.5 L 7 10.5 L 7 13.5 L 10.5 13.5 Z" />













    <path













        android:pathData="M0,0h24v24H0V0z" />



























</vector>
























core/res/res/values/config.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -2613,6 +2613,7 @@













         "silent" = silent mode















         "users" = list of users















         "restart" = restart device













         "emergency" = Launch emergency dialer















         "lockdown" = Lock down device until the user authenticates















         "logout" =  Logout the current user















         -->









@@ -2623,6 +2624,7 @@













        <item>logout</item>















        <item>bugreport</item>















        <item>screenshot</item>













        <item>emergency</item>















    </string-array>































    <!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully

































core/res/res/values/symbols.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -2989,7 +2989,7 @@













  <!-- Global actions icons -->















  <java-symbol type="drawable" name="ic_restart" />















  <java-symbol type="drawable" name="ic_screenshot" />



























  <java-symbol type="drawable" name="ic_faster_emergency" />















  <java-symbol type="drawable" name="emergency_icon" />































  <java-symbol type="array" name="config_convert_to_emergency_number_map" />