Merge "Autofill: fix ClassCastException in SaveUi" into pi-dev

This commit is contained in:
Dake Gu
2018-05-22 21:25:49 +00:00
committed by Android (Google) Code Review

View File

@@ -53,7 +53,6 @@ import android.view.WindowManager;
import android.view.autofill.AutofillManager; import android.view.autofill.AutofillManager;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import android.widget.ScrollView;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.R; import com.android.internal.R;
@@ -208,7 +207,7 @@ final class SaveUi {
mSubTitle = info.getDescription(); mSubTitle = info.getDescription();
if (mSubTitle != null) { if (mSubTitle != null) {
writeLog(MetricsEvent.AUTOFILL_SAVE_CUSTOM_SUBTITLE, type); writeLog(MetricsEvent.AUTOFILL_SAVE_CUSTOM_SUBTITLE, type);
final ScrollView subtitleContainer = final ViewGroup subtitleContainer =
view.findViewById(R.id.autofill_save_custom_subtitle); view.findViewById(R.id.autofill_save_custom_subtitle);
final TextView subtitleView = new TextView(context); final TextView subtitleView = new TextView(context);
subtitleView.setText(mSubTitle); subtitleView.setText(mSubTitle);
@@ -361,7 +360,7 @@ final class SaveUi {
} }
// Finally, add the custom description to the save UI. // Finally, add the custom description to the save UI.
final ScrollView subtitleContainer = final ViewGroup subtitleContainer =
saveUiView.findViewById(R.id.autofill_save_custom_subtitle); saveUiView.findViewById(R.id.autofill_save_custom_subtitle);
subtitleContainer.addView(customSubtitleView); subtitleContainer.addView(customSubtitleView);
subtitleContainer.setVisibility(View.VISIBLE); subtitleContainer.setVisibility(View.VISIBLE);