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

Commit 39c44743 authored by Michael Bestas's avatar Michael Bestas Committed by Roman Birg
Browse files

Settings: Remove more unused resources

Change-Id: Iab89d1cc9ee3dfc07bbeebd34fa309004ef52a5a
parent aebef5b3
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -30,13 +30,6 @@
        <item>3</item>
    </string-array>

    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
    <string-array name="profile_values" translatable="false">
        <item>OVERRIDE</item>
        <item>SUPPRESS</item>
        <item>DEFAULT</item>
    </string-array>

    <!-- Profile 2G-3G and 4G mode options. -->
    <string-array name="profile_networkmode_entries_4g" translatable="false">
        <item>@string/profile_networkmode_2g</item>
+10 −12
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ limitations under the License.

    <drawable name="expanded_item_bg_activated">#ffEEEEEE</drawable>
    <drawable name="expanded_item_bg">@android:color/background_light</drawable>
    <color name="expanded_button_color_normal">#4CAF50</color>
    <color name="expanded_button_color_close">#F44336</color>
    <color name="qs_tile_tint_color">#FF009587</color>

    <!-- Hard coded background and text colors exposed for better theme support -->
+1 −2
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2012-2013 The CyanogenMod Project
     Copyright (C) 2012-2015 The CyanogenMod Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
<resources>
    <dimen name="profile_instruction_padding">8dp</dimen>
    <dimen name="shortcut_picker_left_padding">40dip</dimen>
    <dimen name="fab_line_width">2dp</dimen>

    <dimen name="lockscreen_icon_side_padding">10dp</dimen>
    <dimen name="lockscreen_icon_size">35dp</dimen>
+0 −24
Original line number Diff line number Diff line
@@ -101,16 +101,6 @@
    <string name="profile_trigger_disconnect">On disconnect</string>
    <string name="profile_trigger_notrigger">No trigger</string>

    <!-- Profile Settings sound modes labels -->
    <string name="sound_mode">Notification mode</string>
    <string name="ringer_mode">Ring mode</string>
    <string name="lights_mode">Lights mode</string>
    <string name="vibrate_mode">Vibrate mode</string>

    <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
    <string name="soundtone_title">Notification tone</string>
    <string name="soundtone_summary" translatable="false">""</string>

    <!-- Title for application group setting screen -->
    <string name="profile_applist_title">Apps</string>

@@ -743,9 +733,6 @@
    <!-- Message when bluetooth dialog for pin entry is showing  when HIGH security enabled-->
    <string name="bluetooth_enter_pin_msg_hs">To pair with:<xliff:g id="bold">&lt;br>&lt;b></xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold">&lt;/b>&lt;br>&lt;br></xliff:g>Type the device\'s required PIN (16 digits or more):</string>

    <!-- Bluetooth settings.  Message when connected to a device, except for pbap. [CHAR LIMIT=40] -->
    <string name="bluetooth_connected_no_pbap">Connected (no phonebook access)</string>

    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the DUN profile. -->
    <string name="bluetooth_profile_dun">Dial-up Network Access</string>
    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the SAP profile. -->
@@ -834,10 +821,6 @@
    <string name="usb_unmount_inform_text" product="default">USB storage will be unmounted.</string>
    <string name="uicc_unmount_inform_text" product="default">UICC storage will be unmounted.</string>

    <string name="usb_media_format_title" product="default">Erase USB storage</string>
    <string name="uicc_media_format_title" product="default">Erase UICC storage</string>
    <string name="usb_media_format_summary" product="default">Erases all data on the USB storage</string>
    <string name="uicc_media_format_summary" product="default">Erases all data on the UICC storage</string>
    <string name="sdcard_media_format_desc" product="default">Erase the SD card? You will lose <b>all</b> data on the card!</string>
    <string name="usb_media_format_desc" product="default">Erase the USB storage? You will lose <b>all</b> data on the storage!</string>
    <string name="uicc_media_format_desc" product="default">Erase the UICC storage? You will lose <b>all</b> data on the storage!</string>
@@ -893,8 +876,6 @@
    <string name="sim_enabler_enabling">Activating <xliff:g id="name">%s</xliff:g>\u2026</string>
    <string name="sim_enabler_disabling">Deactivating <xliff:g id="name">%s</xliff:g>\u2026</string>
    <string name="sim_enabler_deactivate">Deactivate</string>
    <string name="sub_activate_success">SIM activated.</string>
    <string name="sub_deactivate_success">SIM deactivated.</string>

    <string name="primary_sub_select_title">Default 3G/LTE subscription</string>

@@ -1087,13 +1068,11 @@
    <string name="expanded_hide_navigation">Hide navigation bar</string>
    <string name="expanded_hide_both">Hide both</string>
    <string name="expanded_nothing_to_show">To add a custom per-app configuration for expanded state, set \'Enabled for all\' to the off position</string>
    <string name="expanded_desktop_state">Expanded state</string>
    <string name="expanded_enabled_for_all">Enabled for all</string>
    <string name="expanded_desktop_style">Expanded desktop style</string>
    <string name="expanded_desktop_style_description">Choose a default expanded desktop style</string>
    <string name="expanded_desktop_title">Expanded desktop options</string>

    <string name="lockscreen_settings_title">Lock screen</string>
    <string name="lockscreen_targets_message">Lock screen shortcuts</string>
    <string name="lockscreen_default_target">Default</string>
    <string name="lockscreen_none_target">None</string>
@@ -1104,9 +1083,6 @@
    <!-- WhisperPush -->
    <string name="whisperpush_title">WhisperPush</string>
    <string name="whisperpush_summary">Manage secure SMS settings</string>
    <string name="whisperpush_registration_title">Register</string>
    <string name="whisperpush_registration_summary">Register for WhisperPush to enable encrypted SMS.</string>
    <string name="whisperpush_identitykey_title">Review identity keys</string>

    <string name="navigation_ring_title">Navigation ring targets</string>
    <string name="navigation_ring_message">Tap the edit icon to open the navigation ring for editing.\n\nSelect a target to configure its behavior.\n\nTap the \'\u2713\' icon to save your changes, or \'Restore defaults\' to reset the settings to defaults.</string>
+9 −3
Original line number Diff line number Diff line
@@ -349,9 +349,15 @@ public class Memory extends SettingsPreferenceFragment implements Indexable {

    private void doUnmount() {
        // Present a toast here
        if (mStorageVolume != null && MediaFormat.isUsbStorage(mStorageVolume, getActivity())) {
        if (mStorageVolume != null) {
            // set the strings based on volume
            if (MediaFormat.isUsbStorage(mStorageVolume, getActivity())) {
                Toast.makeText(getActivity(), R.string.usb_unmount_inform_text,
                        Toast.LENGTH_SHORT).show();
            } else if (MediaFormat.isUiccStorage(mStorageVolume, getActivity())) {
                Toast.makeText(getActivity(), R.string.uicc_unmount_inform_text,
                        Toast.LENGTH_SHORT).show();
            }
        } else {
            Toast.makeText(getActivity(), R.string.sdcard_unmount_inform_text,
                    Toast.LENGTH_SHORT).show();