author | Chris Kitching <chriskitching@linux.com> |
Sun, 12 Oct 2014 02:40:31 +0100 | |
changeset 209994 | 25b2da75efc60899bbc6970f404882adc03d1746 |
parent 209993 | 1278a4bf957cd5eae5c74e7eafff39ab128b7ac1 |
child 209995 | 6c618ccad72e438a1f8562d7118bfba404ee8573 |
push id | 27634 |
push user | ryanvm@gmail.com |
push date | Sun, 12 Oct 2014 18:44:46 +0000 |
treeherder | mozilla-central@5ec529e71a22 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | rnewman |
bugs | 1081605 |
milestone | 35.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
mobile/android/base/FormAssistPopup.java | file | annotate | diff | comparison | revisions | |
mobile/android/base/fxa/authenticator/AndroidFxAccount.java | file | annotate | diff | comparison | revisions |
--- a/mobile/android/base/FormAssistPopup.java +++ b/mobile/android/base/FormAssistPopup.java @@ -68,23 +68,23 @@ public class FormAssistPopup extends Rel private static int sValidationMessageHeight; private static int sValidationTextMarginTop; private static LayoutParams sValidationTextLayoutNormal; private static LayoutParams sValidationTextLayoutInverted; private static final String LOGTAG = "GeckoFormAssistPopup"; // The blocklist is so short that ArrayList is probably cheaper than HashSet. - private static final Collection<String> sInputMethodBlocklist = Arrays.asList(new String[] { + private static final Collection<String> sInputMethodBlocklist = Arrays.asList( InputMethods.METHOD_GOOGLE_JAPANESE_INPUT, // bug 775850 InputMethods.METHOD_OPENWNN_PLUS, // bug 768108 InputMethods.METHOD_SIMEJI, // bug 768108 InputMethods.METHOD_SWYPE, // bug 755909 - InputMethods.METHOD_SWYPE_BETA, // bug 755909 - }); + InputMethods.METHOD_SWYPE_BETA // bug 755909 + ); public FormAssistPopup(Context context, AttributeSet attrs) { super(context, attrs); mContext = context; mAnimation = AnimationUtils.loadAnimation(context, R.anim.grow_fade_in); mAnimation.setDuration(75);
--- a/mobile/android/base/fxa/authenticator/AndroidFxAccount.java +++ b/mobile/android/base/fxa/authenticator/AndroidFxAccount.java @@ -58,18 +58,17 @@ public class AndroidFxAccount { public static final String ACCOUNT_KEY_TOKEN_SERVER = "tokenServerURI"; // Sync-specific. public static final String ACCOUNT_KEY_DESCRIPTOR = "descriptor"; public static final int CURRENT_BUNDLE_VERSION = 2; public static final String BUNDLE_KEY_BUNDLE_VERSION = "version"; public static final String BUNDLE_KEY_STATE_LABEL = "stateLabel"; public static final String BUNDLE_KEY_STATE = "state"; - protected static final List<String> ANDROID_AUTHORITIES = Collections.unmodifiableList(Arrays.asList( - new String[] { BrowserContract.AUTHORITY })); + protected static final List<String> ANDROID_AUTHORITIES = Collections.unmodifiableList(Arrays.asList(BrowserContract.AUTHORITY)); protected final Context context; protected final AccountManager accountManager; protected final Account account; /** * Create an Android Firefox Account instance backed by an Android Account * instance.