Add full support for Android O and update deps (#850)

SUPERCILEX · samtstern · commit 2eb8050ce413 · 2017-08-03T15:21:22.000-07:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,15 +42,15 @@ dependencies {
     compile "com.google.firebase:firebase-database:$firebaseVersion"
     compile "com.google.firebase:firebase-storage:$firebaseVersion"
 
-    compile('com.facebook.android:facebook-android-sdk:4.23.0')
+    compile('com.facebook.android:facebook-android-sdk:4.25.0')
     compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
 
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
-    compile 'pub.devrel:easypermissions:0.4.2'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'pub.devrel:easypermissions:0.4.3'
+    compile 'com.jakewharton:butterknife:8.7.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     compile "com.google.firebase:firebase-auth:$firebaseVersion"
     compile "com.google.android.gms:play-services-auth:$firebaseVersion"
 
-    provided 'com.facebook.android:facebook-android-sdk:4.23.0'
+    provided 'com.facebook.android:facebook-android-sdk:4.25.0'
     provided("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
 
     // The following libraries are needed to prevent incompatibilities with the facebook
@@ -61,7 +61,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     testCompile 'org.mockito:mockito-core:2.8.+'
     testCompile 'org.robolectric:robolectric:3.4'
-    testCompile 'com.facebook.android:facebook-android-sdk:4.23.0'
+    testCompile 'com.facebook.android:facebook-android-sdk:4.25.0'
 }
 
 javadoc.exclude([
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -47,6 +47,8 @@
 import com.google.firebase.auth.PhoneAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -73,6 +75,7 @@ public class AuthUI {
                        FacebookAuthProvider.PROVIDER_ID, FACEBOOK_PROVIDER,
                        TwitterAuthProvider.PROVIDER_ID, TWITTER_PROVIDER
                })
+    @Retention(RetentionPolicy.SOURCE)
     public @interface SupportedProvider {}
 
     /**
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -88,8 +88,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mIdpResponse = IdpResponse.fromResultIntent(getIntent());
         mEmail = mIdpResponse.getEmail();
 
-        mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
-        mPasswordField = (EditText) findViewById(R.id.password);
+        mPasswordLayout = findViewById(R.id.password_layout);
+        mPasswordField = findViewById(R.id.password);
 
         ImeHelper.setImeOnDoneListener(mPasswordField, this);
 
@@ -103,7 +103,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 emailStart + mEmail.length(),
                 Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 
-        TextView bodyTextView = ((TextView) findViewById(R.id.welcome_back_password_body));
+        TextView bodyTextView = findViewById(R.id.welcome_back_password_body);
         bodyTextView.setText(spannableStringBuilder);
 
         // Click listeners
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
@@ -1,9 +1,11 @@
 package com.firebase.ui.auth.ui.email;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -94,6 +96,7 @@ public static CheckEmailFragment newInstance(@NonNull FlowParameters flowParamet
         return fragment;
     }
 
+    @SuppressLint("NewApi") // TODO remove once lint understands Build.VERSION_CODES.O
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater,
@@ -102,14 +105,18 @@ public View onCreateView(LayoutInflater inflater,
         View v = inflater.inflate(R.layout.fui_check_email_layout, container, false);
 
         // Email field and validator
-        mEmailLayout = (TextInputLayout) v.findViewById(R.id.email_layout);
-        mEmailEditText = (EditText) v.findViewById(R.id.email);
+        mEmailLayout = v.findViewById(R.id.email_layout);
+        mEmailEditText = v.findViewById(R.id.email);
         mEmailFieldValidator = new EmailFieldValidator(mEmailLayout);
         mEmailLayout.setOnClickListener(this);
         mEmailEditText.setOnClickListener(this);
 
         ImeHelper.setImeOnDoneListener(mEmailEditText, this);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && getFlowParams().enableHints) {
+            mEmailEditText.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO);
+        }
+
         // "Next" button
         v.findViewById(R.id.button_next).setOnClickListener(this);
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
@@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mEmailFieldValidator =
                 new EmailFieldValidator((TextInputLayout) findViewById(R.id.email_layout));
-        mEmailEditText = (EditText) findViewById(R.id.email);
+        mEmailEditText = findViewById(R.id.email);
 
         String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
         if (email != null) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
@@ -43,7 +43,7 @@ public void onDismiss(DialogInterface anInterface) {
                 .show();
     }
 
-    public void finish(int resultCode, Intent resultIntent) {
+    private void finish(int resultCode, Intent resultIntent) {
         getActivity().setResult(resultCode, resultIntent);
         getActivity().finish();
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
@@ -115,7 +115,7 @@ public void onNewUser(User user) {
         // New user, direct them to create an account with email/password
         // if account creation is enabled in SignInIntentBuilder
 
-        TextInputLayout emailLayout = (TextInputLayout) findViewById(R.id.email_layout);
+        TextInputLayout emailLayout = findViewById(R.id.email_layout);
 
         if (getFlowParams().allowNewEmailAccounts) {
             RegisterEmailFragment fragment = RegisterEmailFragment.newInstance(
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
@@ -1,5 +1,7 @@
 package com.firebase.ui.auth.ui.email;
 
+import android.annotation.SuppressLint;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -88,6 +90,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         }
     }
 
+    @SuppressLint("NewApi") // TODO remove once lint understands Build.VERSION_CODES.O
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater,
@@ -96,12 +99,12 @@ public View onCreateView(LayoutInflater inflater,
 
         View v = inflater.inflate(R.layout.fui_register_email_layout, container, false);
 
-        mEmailEditText = (EditText) v.findViewById(R.id.email);
-        mNameEditText = (EditText) v.findViewById(R.id.name);
-        mPasswordEditText = (EditText) v.findViewById(R.id.password);
-        mAgreementText = (TextView) v.findViewById(R.id.create_account_text);
-        mEmailInput = (TextInputLayout) v.findViewById(R.id.email_layout);
-        mPasswordInput = (TextInputLayout) v.findViewById(R.id.password_layout);
+        mEmailEditText = v.findViewById(R.id.email);
+        mNameEditText = v.findViewById(R.id.name);
+        mPasswordEditText = v.findViewById(R.id.password);
+        mAgreementText = v.findViewById(R.id.create_account_text);
+        mEmailInput = v.findViewById(R.id.email_layout);
+        mPasswordInput = v.findViewById(R.id.password_layout);
 
         mPasswordFieldValidator = new PasswordFieldValidator(
                 mPasswordInput,
@@ -117,6 +120,10 @@ public View onCreateView(LayoutInflater inflater,
         mPasswordEditText.setOnFocusChangeListener(this);
         v.findViewById(R.id.button_create).setOnClickListener(this);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && getFlowParams().enableCredentials) {
+            mEmailEditText.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO);
+        }
+
         if (savedInstanceState != null) {
             return v;
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -83,14 +83,14 @@ protected void onCreate(Bundle savedInstanceState) {
         if (logoId == AuthUI.NO_LOGO) {
             findViewById(R.id.logo).setVisibility(View.GONE);
 
-            ConstraintLayout layout = (ConstraintLayout) findViewById(R.id.root);
+            ConstraintLayout layout = findViewById(R.id.root);
             ConstraintSet constraints = new ConstraintSet();
             constraints.clone(layout);
             constraints.setHorizontalBias(R.id.container, 0.5f);
             constraints.setVerticalBias(R.id.container, 0.5f);
             constraints.applyTo(layout);
         } else {
-            ImageView logo = (ImageView) findViewById(R.id.logo);
+            ImageView logo = findViewById(R.id.logo);
             logo.setImageResource(logoId);
         }
     }
@@ -121,7 +121,7 @@ private void populateIdpList(List<IdpConfig> providers) {
             }
         }
 
-        ViewGroup btnHolder = (ViewGroup) findViewById(R.id.btn_holder);
+        ViewGroup btnHolder = findViewById(R.id.btn_holder);
         for (final Provider provider : mProviders) {
             View loginButton = getLayoutInflater()
                     .inflate(provider.getButtonLayout(), btnHolder, false);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java
@@ -47,9 +47,9 @@ public static CompletableProgressDialog show(FragmentManager manager) {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         View rootView = View.inflate(getContext(), R.layout.fui_phone_progress_dialog, null);
 
-        mProgress = (ProgressBar) rootView.findViewById(R.id.progress_bar);
-        mMessageView = (TextView) rootView.findViewById(R.id.progress_msg);
-        mSuccessImage = (ImageView) rootView.findViewById(R.id.progress_success_imaage);
+        mProgress = rootView.findViewById(R.id.progress_bar);
+        mMessageView = rootView.findViewById(R.id.progress_msg);
+        mSuccessImage = rootView.findViewById(R.id.progress_success_imaage);
 
         if (mMessage != null) {
             setMessage(mMessage);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java
@@ -68,7 +68,6 @@ static void load() {
      * @param phoneNumber that may or may not itself have country code
      * @param countryInfo must have locale with ISO 3166 2-letter code for country
      */
-    @Nullable
     static String formatPhoneNumber(@NonNull String phoneNumber, @NonNull CountryInfo countryInfo) {
         return phoneNumber.startsWith("+")
                 ? phoneNumber
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -55,7 +55,7 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class PhoneVerificationActivity extends AppCompatBase {
     private enum VerificationState {
-        VERIFICATION_NOT_STARTED, VERIFICATION_STARTED, VERIFIED;
+        VERIFICATION_NOT_STARTED, VERIFICATION_STARTED, VERIFIED
     }
 
     private static final String PHONE_VERIFICATION_LOG_TAG = "PhoneVerification";
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
@@ -74,12 +74,12 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         View v = inflater.inflate(R.layout.fui_confirmation_code_layout, container, false);
         FragmentActivity parentActivity = getActivity();
 
-        mEditPhoneTextView = (TextView) v.findViewById(R.id.edit_phone_number);
-        mCountDownTextView = (TextView) v.findViewById(R.id.ticker);
-        mResendCodeTextView = (TextView) v.findViewById(R.id.resend_code);
-        mConfirmationCodeEditText = (SpacedEditText) v.findViewById(R.id.confirmation_code);
-        mSubmitConfirmationButton = (Button) v.findViewById(R.id.submit_confirmation_code);
-        mAgreementText = (TextView) v.findViewById(R.id.create_account_tos);
+        mEditPhoneTextView = v.findViewById(R.id.edit_phone_number);
+        mCountDownTextView = v.findViewById(R.id.ticker);
+        mResendCodeTextView = v.findViewById(R.id.resend_code);
+        mConfirmationCodeEditText = v.findViewById(R.id.confirmation_code);
+        mSubmitConfirmationButton = v.findViewById(R.id.submit_confirmation_code);
+        mAgreementText = v.findViewById(R.id.create_account_tos);
 
         final String phoneNumber = getArguments().getString(ExtraConstants.EXTRA_PHONE);
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
@@ -88,11 +88,11 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         View v = inflater.inflate(R.layout.fui_phone_layout, container, false);
 
-        countryListSpinner = (CountryListSpinner) v.findViewById(R.id.country_list);
-        mPhoneEditText = (EditText) v.findViewById(R.id.phone_number);
-        errorEditText = (TextView) v.findViewById(R.id.phone_number_error);
-        sendCodeButton = (Button) v.findViewById(R.id.send_code);
-        mSmsTermsText = (TextView) v.findViewById(R.id.send_sms_tos);
+        countryListSpinner = v.findViewById(R.id.country_list);
+        mPhoneEditText = v.findViewById(R.id.phone_number);
+        errorEditText = v.findViewById(R.id.phone_number_error);
+        sendCodeButton = v.findViewById(R.id.send_code);
+        mSmsTermsText = v.findViewById(R.id.send_sms_tos);
 
         FragmentActivity parentActivity = getActivity();
         parentActivity.setTitle(getString(R.string.fui_verify_phone_number_title));
diff --git a/auth/src/main/res/layout/fui_confirmation_code_layout.xml b/auth/src/main/res/layout/fui_confirmation_code_layout.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content">
 
         <TextView
-            android:id="@+id/dgts__titleText"
+            android:id="@+id/dgts_titleText"
             style="@style/FirebaseUI.Text.T08"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             style="@style/FirebaseUI.Text.T08"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/dgts__titleText"
+            android:layout_below="@+id/dgts_titleText"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/fui_linkColor"
             tools:ignore="SelectableText" />
@@ -98,7 +98,7 @@
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:layout_below="@id/resend_code_layout"
             android:textIsSelectable="false"
-            tools:text="@string/create_account_preamble" />
+            tools:text="@string/fui_create_account_preamble_tos_and_pp" />
 
     </RelativeLayout>
 
diff --git a/auth/src/main/res/layout/fui_register_email_layout.xml b/auth/src/main/res/layout/fui_register_email_layout.xml
@@ -71,7 +71,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:textIsSelectable="false"
-            tools:text="@string/create_account_preamble" />
+            tools:text="@string/fui_create_account_preamble_tos_and_pp" />
 
         <Button
             android:id="@+id/button_create"
diff --git a/auth/src/main/res/values-v26/styles.xml b/auth/src/main/res/values-v26/styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <style name="FirebaseUI.TextInputEditText.EmailField">
+        <item name="android:autofillHints">emailAddress</item>
+        <item name="android:inputType">textEmailAddress</item>
+    </style>
+
+    <style name="FirebaseUI.TextInputEditText.NameField">
+        <item name="android:autofillHints">name</item>
+        <item name="android:inputType">textCapWords</item>
+    </style>
+
+    <style name="FirebaseUI.TextInputEditText.PhoneField">
+        <item name="android:autofillHints">phone</item>
+        <item name="android:hint">@string/fui_phone_hint</item>
+        <item name="android:inputType">phone</item>
+        <item name="android:imeOptions">actionNext</item>
+        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingTop">16dp</item>
+    </style>
+
+    <style name="FirebaseUI.TextInputEditText.PasswordField">
+        <item name="android:autofillHints">password</item>
+        <item name="android:inputType">textPassword</item>
+    </style>
+
+</resources>
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-           tools:ignore="ResourceName">
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
 
     <style name="FirebaseUI" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
@@ -60,7 +60,7 @@ private RecoverPasswordActivity createActivity() {
     public void testNextButton_sendsEmail() {
         RecoverPasswordActivity recoverPasswordActivity = createActivity();
 
-        Button nextButton = (Button) recoverPasswordActivity.findViewById(R.id.button_done);
+        Button nextButton = recoverPasswordActivity.findViewById(R.id.button_done);
         when(AuthHelperShadow.sFirebaseAuth.sendPasswordResetEmail(TestConstants.EMAIL))
                 .thenReturn(new AutoCompleteTask<Void>(null, true, null));
         nextButton.performClick();
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
diff --git a/database/build.gradle b/database/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void onDismiss(DialogInterface anInterface) {`
`43`	`43`	`.show();`
`44`	`44`	`}`
`45`	`45`
`46`		`- public void finish(int resultCode, Intent resultIntent) {`
	`46`	`+ private void finish(int resultCode, Intent resultIntent) {`
`47`	`47`	`getActivity().setResult(resultCode, resultIntent);`
`48`	`48`	`getActivity().finish();`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,14 +83,14 @@ protected void onCreate(Bundle savedInstanceState) {`
`83`	`83`	`if (logoId == AuthUI.NO_LOGO) {`
`84`	`84`	`findViewById(R.id.logo).setVisibility(View.GONE);`
`85`	`85`
`86`		`- ConstraintLayout layout = (ConstraintLayout) findViewById(R.id.root);`
	`86`	`+ ConstraintLayout layout = findViewById(R.id.root);`
`87`	`87`	`ConstraintSet constraints = new ConstraintSet();`
`88`	`88`	`constraints.clone(layout);`
`89`	`89`	`constraints.setHorizontalBias(R.id.container, 0.5f);`
`90`	`90`	`constraints.setVerticalBias(R.id.container, 0.5f);`
`91`	`91`	`constraints.applyTo(layout);`
`92`	`92`	`} else {`
`93`		`- ImageView logo = (ImageView) findViewById(R.id.logo);`
	`93`	`+ ImageView logo = findViewById(R.id.logo);`
`94`	`94`	`logo.setImageResource(logoId);`
`95`	`95`	`}`
`96`	`96`	`}`
`@@ -121,7 +121,7 @@ private void populateIdpList(List<IdpConfig> providers) {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`- ViewGroup btnHolder = (ViewGroup) findViewById(R.id.btn_holder);`
	`124`	`+ ViewGroup btnHolder = findViewById(R.id.btn_holder);`
`125`	`125`	`for (final Provider provider : mProviders) {`
`126`	`126`	`View loginButton = getLayoutInflater()`
`127`	`127`	`.inflate(provider.getButtonLayout(), btnHolder, false);`