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

Commit dca06efb authored by Arne Coucheron's avatar Arne Coucheron Committed by Zhao Wei Liew
Browse files

Revert "SystemUI: Provide correct resource type" 

This reverts commit b99261ab.

Change-Id: I1d7f5228ee4f2ff89057a97cc05443c95f4bfe5f
parent f8dac7d7

core/res/res/values/config.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -2691,7 +2691,6 @@ 
    <bool name="config_display_rat">false</bool>

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





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

    <!-- 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_2g" translatable="false">2G</string>

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

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

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

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

core/res/res/values/symbols.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -2684,7 +2684,6 @@ 
  <!-- SIM contact batch operation -->

  <!-- SIM contact batch operation -->

  <java-symbol type="bool" name="config_sim_phonebook_batch_operation" />

  <java-symbol type="bool" name="config_sim_phonebook_batch_operation" />

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

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

  <java-symbol type="string" name="config_rat_unknown" />

  <java-symbol type="string" name="config_rat_2g" />

  <java-symbol type="string" name="config_rat_2g" />

  <java-symbol type="string" name="config_rat_3g" />

  <java-symbol type="string" name="config_rat_3g" />

  <java-symbol type="string" name="config_rat_4g" />

  <java-symbol type="string" name="config_rat_4g" />

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -543,8 +543,7 @@ public class CarrierText extends TextView { 
    }

    }





    private String networkClassToString (int networkClass) {

    private String networkClassToString (int networkClass) {

        final int[] classIds =

        final int[] classIds = { 0, // TelephonyManager.NETWORK_CLASS_UNKNOWN

            {com.android.internal.R.string.config_rat_unknown,

            com.android.internal.R.string.config_rat_2g,

            com.android.internal.R.string.config_rat_2g,

            com.android.internal.R.string.config_rat_3g,

            com.android.internal.R.string.config_rat_3g,

            com.android.internal.R.string.config_rat_4g };

            com.android.internal.R.string.config_rat_4g };

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -412,8 +412,7 @@ public class MobileSignalController extends SignalController< 
    }

    }





    private String networkClassToString (int networkClass) {

    private String networkClassToString (int networkClass) {

        final int[] classIds =

        final int[] classIds = { 0, // TelephonyManager.NETWORK_CLASS_UNKNOWN

            {com.android.internal.R.string.config_rat_unknown, // TelephonyManager.NETWORK_CLASS_UNKNOWN

            com.android.internal.R.string.config_rat_2g,

            com.android.internal.R.string.config_rat_2g,

            com.android.internal.R.string.config_rat_3g,

            com.android.internal.R.string.config_rat_3g,

            com.android.internal.R.string.config_rat_4g };

            com.android.internal.R.string.config_rat_4g };