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

Commit 726fb282 authored by Jason Monk's avatar Jason Monk
Browse files

Change carrier text to 'airplane mode' when on 

Bug: 18833886
Change-Id: Iae757cacb7770cbe7e3509a943c78d04ee0f99f4
parent 066be66d

packages/Keyguard/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ LOCAL_MODULE := Keyguard 


LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := SettingsLib



LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

packages/Keyguard/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -300,4 +300,7 @@ 
    <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Switch input method button.</string>



    <!-- Description of airplane mode -->

    <string name="airplane_mode">Airplane mode</string>



</resources>

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.widget.TextView; 
import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.TelephonyIntents;

import com.android.settingslib.WirelessUtils;



public class CarrierText extends TextView {

    private static final boolean DEBUG = KeyguardConstants.DEBUG;
@@ -146,6 +147,9 @@ public class CarrierText extends TextView { 
                        getContext().getText(R.string.keyguard_missing_sim_message_short), text);

            }

        }

        if (WirelessUtils.isAirplaneModeOn(mContext)) {

            displayText = getContext().getString(R.string.airplane_mode);

        }

        setText(displayText);

    }

packages/SystemUI/res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -100,9 +100,6 @@ 
    <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->

    <string name="status_bar_settings_wifi_button">Wi-Fi</string>



    <!-- Label in the system panel for airplane mode (all radios are turned off)[CHAR LIMIT=30] -->

    <string name="status_bar_settings_airplane">Airplane mode</string>



    <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->

    <string name="status_bar_settings_auto_rotation">Auto-rotate screen</string>
@@ -566,8 +563,6 @@ 
    <!-- Textual description of Ethernet connections -->

    <string name="ethernet_label">Ethernet</string>



    <!-- QuickSettings: Airplane mode [CHAR LIMIT=NONE] -->

    <string name="quick_settings_airplane_mode_label">Airplane mode</string>

    <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->

    <string name="quick_settings_dnd_label">Do not disturb</string>

    <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class AirplaneModeTile extends QSTile<QSTile.BooleanState> { 
        final boolean airplaneMode = value != 0;

        state.value = airplaneMode;

        state.visible = true;

        state.label = mContext.getString(R.string.quick_settings_airplane_mode_label);

        state.label = mContext.getString(R.string.airplane_mode);

        if (airplaneMode) {

            state.icon = mEnable;

            state.contentDescription =  mContext.getString(