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

Commit 74e646ca authored by Dan Morrill's avatar Dan Morrill
Browse files

Fix merge conflict for 'c2e1e329'. 

Conflicts:
	core/res/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
parents ed1a9c77 c2e1e329

core/res/res/values/config.xml

+17 −0
Original line number Diff line number Diff line
@@ -611,4 +611,21 @@ 
         Example 2: devices sold in India should include tables 4 through 13

         to enable use of the new Release 9 tables for Indic languages. -->

    <integer-array name="config_sms_enabled_locking_shift_tables"></integer-array>



    <!-- Set and Unsets WiMAX -->

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

    <!-- Location of the wimax framwork jar location -->

    <string name="config_wimaxServiceJarLocation"></string>

    <!-- Location of the wimax native library locaiton -->

    <string name="config_wimaxNativeLibLocation"></string>

    <!-- Name of the wimax manager class -->

    <string name="config_wimaxManagerClassname"></string>

    <!-- Name of the wimax service class -->

    <string name="config_wimaxServiceClassname"></string>

    <!-- Name of the wimax state tracker clas -->

    <string name="config_wimaxStateTrackerClassname"></string>



    <!-- Set to true if the RSSI should always display CDMA signal strength

         even on EVDO -->

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

</resources>