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

Commit f7b6a236 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove "Edit emergency contact" tile from panic settings. 

Fix: 170636818
Test: manual
Change-Id: I428dbe784be3ac6af045b045a709815eafaae4a9
parent 6208cbfd

res/drawable/ic_emergency_contact.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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"

        android:viewportHeight="24"

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

    <path

        android:pathData="M22,3H2C0.9,3 0,3.9 0,5V19C0,20.1 0.9,21 2,21H22C23.1,21 23.99,20.1 23.99,19L24,5C24,3.9 23.1,3 22,3ZM22,5V19H2V5H22ZM12,9C12,10.66 10.66,12 9,12C7.34,12 6,10.66 6,9C6,7.34 7.34,6 9,6C10.66,6 12,7.34 12,9ZM9,8C9.55,8 10,8.45 10,9C10,9.55 9.55,10 9,10C8.45,10 8,9.55 8,9C8,8.45 8.45,8 9,8ZM9,12.75C11,12.75 15,13.76 15,15.75V18H3V15.75C3,13.76 7,12.75 9,12.75ZM5,16V15.91C5.48,15.41 7.51,14.75 9,14.75C10.49,14.75 12.52,15.41 13,15.91V16H5ZM18.8039,6H17.1962V7.6077L15.8038,6.8039L15,8.1962L16.3923,9L15,9.8038L15.8038,11.1961L17.1962,10.3922V11.9999H18.8039V10.3922L20.1962,11.1961L21,9.8038L19.6077,9L21,8.1962L20.1962,6.8039L18.8039,7.6076V6Z"

        android:fillColor="@android:color/white"

        android:fillType="evenOdd"/>

</vector>

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -11005,9 +11005,6 @@ 
    <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->

    <string name="panic_gesture_sound_setting_summary">Alert before starting the actions</string>













    <!-- Preference title to let user edit their emergency contact list[CHAR_LIMIT=60]-->













    <string name="panic_gesture_edit_emergency_contact_setting_title">Emergency contacts</string>



























    <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->















    <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>















    <!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->

























res/xml/panic_gesture_settings.xml



+0
−11




























Original line number
Diff line number
Diff line








@@ -43,15 +43,4 @@













        app:controller="com.android.settings.gestures.PanicGestureSoundPreferenceController"















        app:allowDividerAbove="true"/>





























    <Preference













        android:key="panic_emergency_contacts"













        android:icon="@drawable/ic_emergency_contact"













        android:title="@string/panic_gesture_edit_emergency_contact_setting_title"













        app:keywords="@sttring/keywords_gesture"













        app:allowDividerAbove="true">













        <intent













            android:action="android.settings.EDIT_EMERGENCY_INFO"













            android:targetPackage="@string/config_aosp_emergency_package_name"/>













    </Preference>





























</PreferenceScreen>