StatusbarSignalCluster: Several fixes for Moto on 5.1

Enable usage of the H+ icon on Moto devices running 5.1 Fix data activity indicators on Moto on 5.1 Fix hiding exclamation points on Moto on 5.1
GravityBox · Jun 30, 2015 · 3848bd0 · 3848bd0 · agentsmith988 · Jul 7, 2015
1 parent da05603
commit 3848bd0
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 25 deletions.
diff --git a/src/com/ceco/lollipop/gravitybox/GravityBoxSettings.java b/src/com/ceco/lollipop/gravitybox/GravityBoxSettings.java
@@ -1692,7 +1692,7 @@ public void onCreate(Bundle savedInstanceState) {
             }
 
             // Remove Moto XT preferences
-            if (Utils.isMotoXtDevice() || sSystemProperties.xposedBridgeVersion < 64) {
+            if ((Utils.isMotoXtDevice() && Build.VERSION.SDK_INT < 22) || sSystemProperties.xposedBridgeVersion < 64) {
                 Preference hPlusPref = findPreference(PREF_KEY_SIGNAL_CLUSTER_HPLUS);
                 if (hPlusPref != null) {
                     mPrefCatSignalCluster.removePreference(hPlusPref);

diff --git a/src/com/ceco/lollipop/gravitybox/StatusbarSignalCluster.java b/src/com/ceco/lollipop/gravitybox/StatusbarSignalCluster.java
@@ -178,7 +178,7 @@ public static void initResources(XSharedPreferences prefs, InitPackageResourcesP
         XModuleResources modRes = XModuleResources.createInstance(GravityBox.MODULE_PATH, resparam.res);
 
         if (prefs.getBoolean(GravityBoxSettings.PREF_KEY_SIGNAL_CLUSTER_HPLUS, false) &&
-                !Utils.isMotoXtDevice() && !Utils.isMtkDevice()) {
+                !(Utils.isMotoXtDevice() && Build.VERSION.SDK_INT < 22) && !Utils.isMtkDevice()) {
 
             sQsHpResId = XResources.getFakeResId(modRes, R.drawable.ic_qs_signal_hp);
             sSbHpResId = XResources.getFakeResId(modRes, R.drawable.stat_sys_data_fully_connected_hp);
@@ -312,37 +312,87 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
         }
 
         if (sPrefs.getBoolean(GravityBoxSettings.PREF_KEY_SIGNAL_CLUSTER_HPLUS, false) &&
-                !Utils.isMotoXtDevice()) {
+                !(Utils.isMotoXtDevice() && Build.VERSION.SDK_INT < 22)) {
             try {
                 if (Build.VERSION.SDK_INT >= 22) {
-                    final Class<?> mobileNetworkCtrlClass = XposedHelpers.findClass(
+                    final Class<?> mobileNetworkCtrlClass = Utils.isMotoXtDevice() ?
+                            XposedHelpers.findClass(
+                            "com.android.systemui.statusbar.policy.MotorolaNetworkControllerImpl.MotorolaMobileSignalController", 
+                            mView.getContext().getClassLoader()) :
+                            XposedHelpers.findClass(
                             "com.android.systemui.statusbar.policy.NetworkControllerImpl.MobileSignalController", 
                             mView.getContext().getClassLoader());
+
                     XposedHelpers.findAndHookMethod(mobileNetworkCtrlClass, "mapIconSets", new XC_MethodHook() {
                         @SuppressWarnings("unchecked")
                         @Override
                         protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                             SparseArray<Object> iconSet = (SparseArray<Object>) XposedHelpers.getObjectField(
                                     param.thisObject, "mNetworkToIconLookup");
                             Object hGroup = iconSet.get(TelephonyManager.NETWORK_TYPE_HSPAP);
-                            Constructor<?> c = hGroup.getClass().getConstructor(
-                                    String.class, int[][].class, int[][].class, int[].class,
-                                    int.class, int.class, int.class, int.class, 
-                                    int.class, int.class, int.class, boolean.class, int[].class);
-                            Object hPlusGroup = c.newInstance("HP",
-                                   XposedHelpers.getObjectField(hGroup, "mSbIcons"),
-                                   XposedHelpers.getObjectField(hGroup, "mQsIcons"),
-                                   XposedHelpers.getObjectField(hGroup, "mContentDesc"),
-                                   XposedHelpers.getIntField(hGroup, "mSbNullState"),
-                                   XposedHelpers.getIntField(hGroup, "mQsNullState"),
-                                   XposedHelpers.getIntField(hGroup, "mSbDiscState"),
-                                   XposedHelpers.getIntField(hGroup, "mQsDiscState"),
-                                   XposedHelpers.getIntField(hGroup, "mDiscContentDesc"),
-                                   XposedHelpers.getIntField(hGroup, "mDataContentDescription"),
-                                   sSbHpResId,
-                                   XposedHelpers.getBooleanField(hGroup, "mIsWide"),
-                                   new int[] { sQsHpResId, sQsHpResId });
-                            iconSet.put(TelephonyManager.NETWORK_TYPE_HSPAP, hPlusGroup);
+                            if (Utils.isMotoXtDevice()) {
+                                Constructor<?> c = hGroup.getClass().getConstructor(
+                                        String.class, int[][].class, int[][].class, int[].class,
+                                        int.class, int.class, int.class, int.class,
+                                        int.class, int.class, int.class, boolean.class, int[].class,
+                                        int[][].class, int[][].class, boolean.class, boolean.class,
+                                        int[].class, int[].class, int[].class, int[].class,
+                                        int[].class, int[].class, int[].class, int[].class,
+                                        int[].class, int.class, int[].class, int[].class, int[].class,
+                                        int[].class, int[].class);
+                                Object hPlusGroup = c.newInstance("HP",
+                                        XposedHelpers.getObjectField(hGroup, "mSbIcons"),
+                                        XposedHelpers.getObjectField(hGroup, "mQsIcons"),
+                                        XposedHelpers.getObjectField(hGroup, "mContentDesc"),
+                                        XposedHelpers.getIntField(hGroup, "mSbNullState"),
+                                        XposedHelpers.getIntField(hGroup, "mQsNullState"),
+                                        XposedHelpers.getIntField(hGroup, "mSbDiscState"),
+                                        XposedHelpers.getIntField(hGroup, "mQsDiscState"),
+                                        XposedHelpers.getIntField(hGroup, "mDiscContentDesc"),
+                                        XposedHelpers.getIntField(hGroup, "mDataContentDescription"),
+                                        sSbHpResId,
+                                        XposedHelpers.getBooleanField(hGroup, "mIsWide"),
+                                        new int[] { sQsHpResId, sQsHpResId },
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSBActivityAOSPLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoQSActivityAOSPLookup"),
+                                        XposedHelpers.getBooleanField(hGroup, "mIsMotoUI"),
+                                        XposedHelpers.getBooleanField(hGroup, "mIsMotoTwoCell"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSimDescriptionLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSBSimLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoQSSimLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSignalDescriptionLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSBSignalLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoQSSignalLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoRoamingDescriptionLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSBRoamingLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoQSRoamingLookup"),
+                                        XposedHelpers.getIntField(hGroup, "mMotoDataTypeDescription"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSBDataTypeLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoQSDataTypeLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoActivityDescriptionLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoSBActivityLookup"),
+                                        XposedHelpers.getObjectField(hGroup, "mMotoQSActivityLookup"));
+                                iconSet.put(TelephonyManager.NETWORK_TYPE_HSPAP, hPlusGroup);
+                            } else {
+                                Constructor<?> c = hGroup.getClass().getConstructor(
+                                        String.class, int[][].class, int[][].class, int[].class,
+                                        int.class, int.class, int.class, int.class,
+                                        int.class, int.class, int.class, boolean.class, int[].class);
+                                Object hPlusGroup = c.newInstance("HP",
+                                        XposedHelpers.getObjectField(hGroup, "mSbIcons"),
+                                        XposedHelpers.getObjectField(hGroup, "mQsIcons"),
+                                        XposedHelpers.getObjectField(hGroup, "mContentDesc"),
+                                        XposedHelpers.getIntField(hGroup, "mSbNullState"),
+                                        XposedHelpers.getIntField(hGroup, "mQsNullState"),
+                                        XposedHelpers.getIntField(hGroup, "mSbDiscState"),
+                                        XposedHelpers.getIntField(hGroup, "mQsDiscState"),
+                                        XposedHelpers.getIntField(hGroup, "mDiscContentDesc"),
+                                        XposedHelpers.getIntField(hGroup, "mDataContentDescription"),
+                                        sSbHpResId,
+                                        XposedHelpers.getBooleanField(hGroup, "mIsWide"),
+                                        new int[] { sQsHpResId, sQsHpResId });
+                                iconSet.put(TelephonyManager.NETWORK_TYPE_HSPAP, hPlusGroup);
+                            }
                         }
                     });
                 } else {
@@ -384,8 +434,12 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
     }
 
     public static void disableSignalExclamationMarks(ClassLoader cl) {
-        final String CLASS_WIFI_ICONS = "com.android.systemui.statusbar.policy.WifiIcons";
-        final String CLASS_TELEPHONY_ICONS = "com.android.systemui.statusbar.policy.TelephonyIcons";
+        final String CLASS_WIFI_ICONS = Utils.isMotoXtDevice() ?
+                "com.android.systemui.statusbar.policy.MotorolaWifiIcons" :
+                "com.android.systemui.statusbar.policy.WifiIcons";
+        final String CLASS_TELEPHONY_ICONS = Utils.isMotoXtDevice() ?
+                "com.android.systemui.statusbar.policy.MotorolaTelephonyIcons" :
+                "com.android.systemui.statusbar.policy.TelephonyIcons";
         Class<?> clsWifiIcons = null;
         Class<?> clsTelephonyIcons = null;
         final String[] wifiFields = new String[] {
@@ -450,7 +504,11 @@ protected boolean supportsDataActivityIndicators() {
 
     protected void setNetworkController(Object networkController) {
         final ClassLoader classLoader = mView.getClass().getClassLoader();
-        final Class<?> networkCtrlCbClass = XposedHelpers.findClass(
+        final Class<?> networkCtrlCbClass = (Utils.isMotoXtDevice() && Build.VERSION.SDK_INT >= 22) ?
+                XposedHelpers.findClass(
+                "com.android.systemui.statusbar.policy.MotorolaNetworkController.NetworkSignalChangedCallback", 
+                classLoader) :
+                XposedHelpers.findClass(
                 "com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback", 
                 classLoader);
         mNetworkControllerCallback = Proxy.newProxyInstance(classLoader,