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

Commit 730d4eae authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert all CAF network indicator stuff. 

 * 7.1 has most of this.

Revert "Fix 4g plus icon issue in quick settings"

This reverts commit 27e3e592.

Revert "Add support for LTE, LTE+ data icons display."

This reverts commit ba9ada25.

Revert "SystemUI: Fix for display datatype icon while in roaming"

This reverts commit bc63ed80.

Revert "Display data RAT icon along with 'R' symbol"

This reverts commit 43ff3982.

Revert "SystemUI: Fix for display datatype icon while in roaming"

This reverts commit bc63ed80.

Revert "SystemUI: System UI force close when switch font size"

This reverts commit 7c2361fc.

Revert "Fix quick settings cellular tile update issue"

This reverts commit 1a17af70.

Revert "Display H icon for HSPA RAT's"

This reverts commit 11aeb8da.

Revert "SystemUi changes submit"

This reverts commit a1b4f559.

Change-Id: Ie916c13edae89a5497131d71a6cd9e0cd5acad29

Revert "Telephony: 4G+ icon display on status bar."

This reverts commit 8a53ccf2.

Revert "IMS: Arrange data, VoLTE icons in correct order."

This reverts commit d31ef479.

Revert "IMS: Show VoWIFI icon based on IMS capabilities."

This reverts commit 4404f4a2.

Revert "Add EMBMS icon and roaming icon changes"

This reverts commit f2370e00.

Change-Id: I6dedd95fefde56a5da8e41e2916e9b2011625598

Revert "Telephony(MSIM): Do not display rat string"

This reverts commit bc5d7407.

Revert "Do not display No SIM when sim info not available"

This reverts commit ca089910.

Revert "Do not display sim absent when sim info is not available."

This reverts commit d0a8d559.

Revert "Add absent sim info to locked screen text"

This reverts commit efc06fdc.

Revert "SystemUI: Provide correct resource type"

This reverts commit b99261ab.

Revert "MSIM: Provide voice pref selection in qucksettings."

This reverts commit d609fd17.

Change-Id: Icabf39843500afacc3aae09feabe6fdce8f05c48

Revert "SystemUI: Customize StatusBar for China carriers"

This reverts commit 0534d81c.

Change-Id: I7a70fb974787ae503b663d4da26da7367e33c3a5
parent 85582013

core/java/android/util/NativeTextHelper.java

deleted100644 → 0
+0 −92
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above

 *       copyright notice, this list of conditions and the following

 *       disclaimer in the documentation and/or other materials provided

 *       with the distribution.

 *     * Neither the name of The Linux Foundation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

package android.util;



import android.content.Context;



/**

 *@hide

 */

public class NativeTextHelper {



    /**

     * parse the string to current language.

     *

     * @param context base context of the application

     * @param originalString original string

     * @param defPackage the target package where the local language strings

     *            defined

     * @param originNamesId the id of the original string array.

     * @param localNamesId the id of the local string keys.

     * @return local language string

     */

    private static final String getLocalString(Context context, String originalString,

            String defPackage, int originNamesId, int localNamesId) {

        String[] origNames = context.getResources().getStringArray(originNamesId);

        String[] localNames = context.getResources().getStringArray(localNamesId);

        for (int i = 0; i < origNames.length; i++) {

            if (origNames[i].equalsIgnoreCase(originalString)) {

                return context.getString(context.getResources().getIdentifier(localNames[i],

                        "string", defPackage));

            }

        }

        return originalString;

    }



    /**

     * parse the string to current language string in public resources.

     *

     * @param context base context of the application

     * @param originalString original string

     * @param originNamesId the id of the original string array.

     * @param localNamesId the id of the local string keys.

     * @return local language string

     */

    public static final String getLocalString(Context context, String originalString,

            int originNamesId, int localNamesId) {

        return getLocalString(context, originalString, "android", originNamesId, localNamesId);

    }



    /**

     * parse the string to current language string in current resources.

     *

     * @param context base context of the application

     * @param originalString original string

     * @param originNamesId the id of the original string array.

     * @param localNamesId the id of the local string keys.

     * @return local language string

     */

    public static final String getInternalLocalString(Context context, String originalString,

            int originNamesId,

            int localNamesId) {

        return getLocalString(context, originalString, context.getPackageName(), originNamesId,

                localNamesId);

    }



}

core/res/res/values-zh-rCN/strings.xml

100755 → 100644
+0 −11
Original line number Diff line number Diff line
@@ -1625,7 +1625,6 @@ 
      <item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item>

      <item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item>

    </plurals>



    <string name="importance_from_user" msgid="7318955817386549931">"这些通知的重要程度由您来设置。"</string>

    <string name="importance_from_person" msgid="9160133597262938296">"这条通知涉及特定的人，因此被归为重要通知。"</string>

    <string name="user_creation_account_exists" msgid="1942606193570143289">"允许<xliff:g id="APP">%1$s</xliff:g>使用 <xliff:g id="ACCOUNT">%2$s</xliff:g> 创建新用户吗？"</string>
@@ -1655,14 +1654,4 @@ 
    <string name="audit_safemode_notification" msgid="6416076898350685856">"恢复出厂设置即可正常使用此设备，不受任何限制"</string>

    <string name="audit_safemode_notification_details" msgid="1860601176690176413">"触摸即可了解详情。"</string>

    <string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string>



    <!-- Carrier Name -->

    <string name="China_Mobile">中国移动</string>

    <string name="China_Unicom">中国联通</string>

    <string name="China_Telecom">中国电信</string>

    <string name="other_permissions">其他权限</string>

    <string name="permission_remember_choice">永远记住</string>

    <string name="permission_title">权限</string>

    <string name="allow_button">允许</string>

    <string name="deny_button">拒绝</string>

</resources>

core/res/res/values-zh-rHK/strings.xml

100755 → 100644
+0 −6
Original line number Diff line number Diff line
@@ -1625,7 +1625,6 @@ 
      <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>

      <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>

    </plurals>



    <string name="importance_from_user" msgid="7318955817386549931">"您可以設定這些通知的重要性。"</string>

    <string name="importance_from_person" msgid="9160133597262938296">"列為重要的原因：涉及的人。"</string>

    <string name="user_creation_account_exists" msgid="1942606193570143289">"要允許 <xliff:g id="APP">%1$s</xliff:g> 使用 <xliff:g id="ACCOUNT">%2$s</xliff:g> 建立新使用者嗎？"</string>
@@ -1655,9 +1654,4 @@ 
    <string name="audit_safemode_notification" msgid="6416076898350685856">"將此裝置回復至原廠設定後，使用將不受限制"</string>

    <string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸以瞭解詳情。"</string>

    <string name="suspended_widget_accessibility" msgid="6712143096475264190">"「<xliff:g id="LABEL">%1$s</xliff:g>」已停用"</string>



    <!-- Carrier Name -->

    <string name="China_Mobile">中國移動</string>

    <string name="China_Unicom">中國聯通</string>

    <string name="China_Telecom">中國電信</string>

</resources>

core/res/res/values/config.xml

100755 → 100644
+0 −45
Original line number Diff line number Diff line
@@ -2621,51 +2621,6 @@ 


    <!-- Configuartion to support SIM contact batch operation.-->

    <bool name="config_sim_phonebook_batch_operation">true</bool>

    <string-array name="origin_carrier_names">

        <item>CHINA\u0020\u0020MOBILE</item>

        <item>CMCC</item>

        <item>CHN-UNICOM</item>

        <item>China Mobile</item>

        <item>China Unicom</item>

        <item>China Telecom</item>

        <item>CHN-CT</item>

        <item>中国移动</item>

        <item>中国联通</item>

        <item>中国电信</item>

        <item>中國移動</item>

        <item>中國聯通</item>

        <item>中國電信</item>

        <item>Searching for Service</item>

    </string-array>



    <string-array name="locale_carrier_names">

        <item>China_Mobile</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>China_Telecom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>roamingTextSearching</item>

    </string-array>



    <!-- monitor locale change -->

    <bool name="config_monitor_locale_change">false</bool>



    <!-- display for radio tech -->

    <bool name="config_display_rat">false</bool>



    <!-- config 2G/3G/4G RAT strings for carriers -->

    <string name="config_rat_unknown" translatable="false">""</string>

    <string name="config_rat_2g" translatable="false">2G</string>

    <string name="config_rat_3g" translatable="false">3G</string>

    <string name="config_rat_4g" translatable="false">4G</string>



    <!-- Zero Balance redirect URL config -->

    <string name="operator_config_url" translatable="false"></string>

core/res/res/values/strings.xml

100755 → 100644
+0 −4
Original line number Diff line number Diff line
@@ -4378,8 +4378,4 @@ 
    <!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->

    <string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>



    <!-- Carrier Name -->

    <string name="China_Mobile">China Mobile</string>

    <string name="China_Unicom">China Unicom</string>

    <string name="China_Telecom">China Telecom</string>

</resources>