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

Commit 02b98156 authored by Michael Bestas's avatar Michael Bestas Committed by Gerrit Code Review
Browse files

SystemUI: Revert CAF UI modifications 

Revert "SystemUI: Support display for radio tech"

This reverts commit 59842109.

Revert "SystemUI: Customize StatusBar for Chinese carrier"

This reverts commit d473d0b2.

Revert "Statusbar: Add customized icons for Chinese carrier"

This reverts commit a6324c72.

Change-Id: Ib03c7455a04bd7d63a8c0a7d238040099e94e89c
parent ce0e7c83

core/java/android/util/NativeTextHelper.java

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

 * Copyright (C) 2015, 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

+0 −4
Original line number Diff line number Diff line
@@ -1520,8 +1520,4 @@ 
      <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>

    <!-- Carrier Name -->

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

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

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

</resources>

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

+0 −4
Original line number Diff line number Diff line
@@ -1517,8 +1517,4 @@ 
      <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>

    <!-- Carrier Name -->

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

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

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

</resources>

core/res/res/values/config.xml

+0 −43
Original line number Diff line number Diff line
@@ -2502,49 +2502,6 @@ 
         NOTE: This requires additional hardware-specific code. -->

    <bool name="config_ui_blur_enabled">false</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>中国移动</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_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_2g" translatable="false">2G</string>

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

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



    <!-- When config_LTE_RSRP_threshold_type is set to "custom" -->

    <integer-array name="config_LTE_RSRP_custom_levels">

        <item>-140</item>

core/res/res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -4122,9 +4122,4 @@ 
    <!-- Used to replace a range of characters in text that is too wide

         for the space allocated to it (two dots). -->

    <string name="ellipsis_two_dots">\u2025</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>