Bug 1081395: Cleanup indentation in PreferenceManagerCompat. r=trivial
authorChris Kitching <chriskitching@linux.com>
Sun, 12 Oct 2014 04:19:04 +0100
changeset 209997 cd62bf9df675aaf25be1170459cbb0e7d504c81a
parent 209996 42758a959e470994cf11d4c68c422086740c4189
child 209998 0fcf464736d797534db58fbd5266f350c3ef42cf
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerstrivial
bugs1081395
milestone35.0a1
Bug 1081395: Cleanup indentation in PreferenceManagerCompat. r=trivial
mobile/android/base/background/preferences/PreferenceManagerCompat.java
--- a/mobile/android/base/background/preferences/PreferenceManagerCompat.java
+++ b/mobile/android/base/background/preferences/PreferenceManagerCompat.java
@@ -27,205 +27,200 @@ import android.content.Context;
 import android.content.Intent;
 import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
 public class PreferenceManagerCompat {
 
-    private static final String TAG = PreferenceManagerCompat.class.getSimpleName();
-
-    /**
-     * Interface definition for a callback to be invoked when a
-     * {@link Preference} in the hierarchy rooted at this {@link PreferenceScreen} is
-     * clicked.
-     */
-    interface OnPreferenceTreeClickListener {
-        /**
-         * Called when a preference in the tree rooted at this
-         * {@link PreferenceScreen} has been clicked.
-         *
-         * @param preferenceScreen The {@link PreferenceScreen} that the
-         *        preference is located in.
-         * @param preference The preference that was clicked.
-         * @return Whether the click was handled.
-         */
-        boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference);
-    }
+  private static final String TAG = PreferenceManagerCompat.class.getSimpleName();
 
-    static PreferenceManager newInstance(Activity activity, int firstRequestCode) {
-        try {
-            Constructor<PreferenceManager> c = PreferenceManager.class.getDeclaredConstructor(Activity.class, int.class);
-            c.setAccessible(true);
-            return c.newInstance(activity, firstRequestCode);
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call constructor PreferenceManager by reflection", e);
-        }
-        return null;
-    }
-
+  /**
+   * Interface definition for a callback to be invoked when a {@link Preference} in the hierarchy
+   * rooted at this {@link PreferenceScreen} is clicked.
+   */
+  interface OnPreferenceTreeClickListener {
     /**
-     * Sets the owning preference fragment
-     */
-    static void setFragment(PreferenceManager manager, PreferenceFragment fragment) {
-        // stub
-    }
-
-    /**
-     * Sets the callback to be invoked when a {@link Preference} in the
-     * hierarchy rooted at this {@link PreferenceManager} is clicked.
+     * Called when a preference in the tree rooted at this {@link PreferenceScreen} has been
+     * clicked.
      *
-     * @param listener The callback to be invoked.
+     * @param preferenceScreen The {@link PreferenceScreen} that the preference is located in.
+     * @param preference       The preference that was clicked.
+     *
+     * @return Whether the click was handled.
      */
-    static void setOnPreferenceTreeClickListener(PreferenceManager manager, final OnPreferenceTreeClickListener listener) {
-        try {
-            Field onPreferenceTreeClickListener = PreferenceManager.class.getDeclaredField("mOnPreferenceTreeClickListener");
-            onPreferenceTreeClickListener.setAccessible(true);
-            if (listener != null) {
-                Object proxy = Proxy.newProxyInstance(
-                        onPreferenceTreeClickListener.getType().getClassLoader(),
-                        new Class<?>[] { onPreferenceTreeClickListener.getType() },
-                        new InvocationHandler() {
-                    @Override
-          public Object invoke(Object proxy, Method method, Object[] args) {
-                        if (method.getName().equals("onPreferenceTreeClick")) {
-                            return listener.onPreferenceTreeClick((PreferenceScreen) args[0], (Preference) args[1]);
-                        } else {
-                            return null;
-                        }
-                    }
-                });
-                onPreferenceTreeClickListener.set(manager, proxy);
-            } else {
-                onPreferenceTreeClickListener.set(manager, null);
-            }
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't set PreferenceManager.mOnPreferenceTreeClickListener by reflection", e);
-        }
+    boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference);
+  }
+
+  static PreferenceManager newInstance(Activity activity, int firstRequestCode) {
+    try {
+      Constructor<PreferenceManager> c = PreferenceManager.class.getDeclaredConstructor(Activity.class, int.class);
+      c.setAccessible(true);
+      return c.newInstance(activity, firstRequestCode);
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call constructor PreferenceManager by reflection", e);
     }
+    return null;
+  }
+
+  /**
+   * Sets the owning preference fragment
+   */
+  static void setFragment(PreferenceManager manager, PreferenceFragment fragment) {
+    // stub
+  }
 
-    /**
-     * Inflates a preference hierarchy from the preference hierarchies of
-     * {@link Activity Activities} that match the given {@link Intent}. An
-     * {@link Activity} defines its preference hierarchy with meta-data using
-     * the {@link #METADATA_KEY_PREFERENCES} key.
-     * <p>
-     * If a preference hierarchy is given, the new preference hierarchies will
-     * be merged in.
-     *
-     * @param queryIntent The intent to match activities.
-     * @param rootPreferences Optional existing hierarchy to merge the new
-     *            hierarchies into.
-     * @return The root hierarchy (if one was not provided, the new hierarchy's
-     *         root).
-     */
-    static PreferenceScreen inflateFromIntent(PreferenceManager manager, Intent intent, PreferenceScreen screen) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("inflateFromIntent", Intent.class, PreferenceScreen.class);
-            m.setAccessible(true);
-            PreferenceScreen prefScreen = (PreferenceScreen) m.invoke(manager, intent, screen);
-            return prefScreen;
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.inflateFromIntent by reflection", e);
-        }
-        return null;
+  /**
+   * Sets the callback to be invoked when a {@link Preference} in the hierarchy rooted at this
+   * {@link PreferenceManager} is clicked.
+   *
+   * @param listener The callback to be invoked.
+   */
+  static void setOnPreferenceTreeClickListener(PreferenceManager manager, final OnPreferenceTreeClickListener listener) {
+    try {
+      Field onPreferenceTreeClickListener = PreferenceManager.class.getDeclaredField("mOnPreferenceTreeClickListener");
+      onPreferenceTreeClickListener.setAccessible(true);
+      if (listener != null) {
+        Object proxy = Proxy.newProxyInstance(
+          onPreferenceTreeClickListener.getType().getClassLoader(),
+          new Class<?>[] { onPreferenceTreeClickListener.getType() },
+          new InvocationHandler() {
+            @Override
+            public Object invoke(Object proxy, Method method, Object[] args) {
+              if (method.getName().equals("onPreferenceTreeClick")) {
+                return listener.onPreferenceTreeClick((PreferenceScreen) args[0], (Preference) args[1]);
+              } else {
+                return null;
+              }
+            }
+          });
+        onPreferenceTreeClickListener.set(manager, proxy);
+      } else {
+        onPreferenceTreeClickListener.set(manager, null);
+      }
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't set PreferenceManager.mOnPreferenceTreeClickListener by reflection", e);
     }
+  }
+
+  /**
+   * Inflates a preference hierarchy from the preference hierarchies of {@link Activity Activities}
+   * that match the given {@link Intent}. An {@link Activity} defines its preference hierarchy with
+   * meta-data using the {@link #METADATA_KEY_PREFERENCES} key.
+   * <p/>
+   * If a preference hierarchy is given, the new preference hierarchies will be merged in.
+   *
+   * @param queryIntent     The intent to match activities.
+   * @param rootPreferences Optional existing hierarchy to merge the new hierarchies into.
+   *
+   * @return The root hierarchy (if one was not provided, the new hierarchy's root).
+   */
+  static PreferenceScreen inflateFromIntent(PreferenceManager manager, Intent intent, PreferenceScreen screen) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("inflateFromIntent", Intent.class, PreferenceScreen.class);
+      m.setAccessible(true);
+      PreferenceScreen prefScreen = (PreferenceScreen) m.invoke(manager, intent, screen);
+      return prefScreen;
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.inflateFromIntent by reflection", e);
+    }
+    return null;
+  }
 
-    /**
-     * Inflates a preference hierarchy from XML. If a preference hierarchy is
-     * given, the new preference hierarchies will be merged in.
-     *
-     * @param context The context of the resource.
-     * @param resId The resource ID of the XML to inflate.
-     * @param rootPreferences Optional existing hierarchy to merge the new
-     *            hierarchies into.
-     * @return The root hierarchy (if one was not provided, the new hierarchy's
-     *         root).
-     * @hide
-     */
-    static PreferenceScreen inflateFromResource(PreferenceManager manager, Activity activity, int resId, PreferenceScreen screen) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("inflateFromResource", Context.class, int.class, PreferenceScreen.class);
-            m.setAccessible(true);
-            PreferenceScreen prefScreen = (PreferenceScreen) m.invoke(manager, activity, resId, screen);
-            return prefScreen;
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.inflateFromResource by reflection", e);
-        }
-        return null;
+  /**
+   * Inflates a preference hierarchy from XML. If a preference hierarchy is given, the new
+   * preference hierarchies will be merged in.
+   *
+   * @param context         The context of the resource.
+   * @param resId           The resource ID of the XML to inflate.
+   * @param rootPreferences Optional existing hierarchy to merge the new hierarchies into.
+   *
+   * @return The root hierarchy (if one was not provided, the new hierarchy's root).
+   *
+   * @hide
+   */
+  static PreferenceScreen inflateFromResource(PreferenceManager manager, Activity activity, int resId, PreferenceScreen screen) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("inflateFromResource", Context.class, int.class, PreferenceScreen.class);
+      m.setAccessible(true);
+      PreferenceScreen prefScreen = (PreferenceScreen) m.invoke(manager, activity, resId, screen);
+      return prefScreen;
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.inflateFromResource by reflection", e);
     }
+    return null;
+  }
 
-    /**
-     * Returns the root of the preference hierarchy managed by this class.
-     *
-     * @return The {@link PreferenceScreen} object that is at the root of the hierarchy.
-     */
-    static PreferenceScreen getPreferenceScreen(PreferenceManager manager) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("getPreferenceScreen");
-            m.setAccessible(true);
-            return (PreferenceScreen) m.invoke(manager);
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.getPreferenceScreen by reflection", e);
-        }
-        return null;
+  /**
+   * Returns the root of the preference hierarchy managed by this class.
+   *
+   * @return The {@link PreferenceScreen} object that is at the root of the hierarchy.
+   */
+  static PreferenceScreen getPreferenceScreen(PreferenceManager manager) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("getPreferenceScreen");
+      m.setAccessible(true);
+      return (PreferenceScreen) m.invoke(manager);
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.getPreferenceScreen by reflection", e);
     }
+    return null;
+  }
 
-    /**
-     * Called by the {@link PreferenceManager} to dispatch a subactivity result.
-     */
-    static void dispatchActivityResult(PreferenceManager manager, int requestCode, int resultCode, Intent data) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityResult", int.class, int.class, Intent.class);
-            m.setAccessible(true);
-            m.invoke(manager, requestCode, resultCode, data);
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.dispatchActivityResult by reflection", e);
-        }
+  /**
+   * Called by the {@link PreferenceManager} to dispatch a subactivity result.
+   */
+  static void dispatchActivityResult(PreferenceManager manager, int requestCode, int resultCode, Intent data) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityResult", int.class, int.class, Intent.class);
+      m.setAccessible(true);
+      m.invoke(manager, requestCode, resultCode, data);
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.dispatchActivityResult by reflection", e);
     }
+  }
 
-    /**
-     * Called by the {@link PreferenceManager} to dispatch the activity stop
-     * event.
-     */
-    static void dispatchActivityStop(PreferenceManager manager) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityStop");
-            m.setAccessible(true);
-            m.invoke(manager);
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.dispatchActivityStop by reflection", e);
-        }
+  /**
+   * Called by the {@link PreferenceManager} to dispatch the activity stop event.
+   */
+  static void dispatchActivityStop(PreferenceManager manager) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityStop");
+      m.setAccessible(true);
+      m.invoke(manager);
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.dispatchActivityStop by reflection", e);
     }
+  }
 
-    /**
-     * Called by the {@link PreferenceManager} to dispatch the activity destroy
-     * event.
-     */
-    static void dispatchActivityDestroy(PreferenceManager manager) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityDestroy");
-            m.setAccessible(true);
-            m.invoke(manager);
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.dispatchActivityDestroy by reflection", e);
-        }
+  /**
+   * Called by the {@link PreferenceManager} to dispatch the activity destroy event.
+   */
+  static void dispatchActivityDestroy(PreferenceManager manager) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityDestroy");
+      m.setAccessible(true);
+      m.invoke(manager);
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.dispatchActivityDestroy by reflection", e);
     }
+  }
 
-    /**
-     * Sets the root of the preference hierarchy.
-     *
-     * @param preferenceScreen The root {@link PreferenceScreen} of the preference hierarchy.
-     * @return Whether the {@link PreferenceScreen} given is different than the previous.
-     */
-    static boolean setPreferences(PreferenceManager manager, PreferenceScreen screen) {
-        try {
-            Method m = PreferenceManager.class.getDeclaredMethod("setPreferences", PreferenceScreen.class);
-            m.setAccessible(true);
-            return ((Boolean) m.invoke(manager, screen));
-        } catch (Exception e) {
-            Log.w(TAG, "Couldn't call PreferenceManager.setPreferences by reflection", e);
-        }
-        return false;
+  /**
+   * Sets the root of the preference hierarchy.
+   *
+   * @param preferenceScreen The root {@link PreferenceScreen} of the preference hierarchy.
+   *
+   * @return Whether the {@link PreferenceScreen} given is different than the previous.
+   */
+  static boolean setPreferences(PreferenceManager manager, PreferenceScreen screen) {
+    try {
+      Method m = PreferenceManager.class.getDeclaredMethod("setPreferences", PreferenceScreen.class);
+      m.setAccessible(true);
+      return ((Boolean) m.invoke(manager, screen));
+    } catch (Exception e) {
+      Log.w(TAG, "Couldn't call PreferenceManager.setPreferences by reflection", e);
     }
+    return false;
+  }
 
 }