OSDN Git Service

Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 10861...
authorMaurice Lam <yukl@google.com>
Thu, 31 Aug 2017 02:39:41 +0000 (02:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 02:39:41 +0000 (02:39 +0000)
am: 46a04ecca1

Change-Id: I865f8da9a0bbf7be9e6ec74b27b55300c604bde0

1  2 
src/com/android/settings/fingerprint/FingerprintSettings.java

@@@ -890,20 -828,11 +890,20 @@@ public class FingerprintSettings extend
          public void onBindViewHolder(PreferenceViewHolder view) {
              super.onBindViewHolder(view);
              mView = view.itemView;
 +            mDeleteView = view.itemView.findViewById(R.id.delete_button);
 +            mDeleteView.setOnClickListener(new View.OnClickListener() {
 +                @Override
 +                public void onClick(View v) {
 +                    if (mOnDeleteClickListener != null) {
 +                        mOnDeleteClickListener.onDeleteClick(FingerprintPreference.this);
 +                    }
 +                }
 +            });
          }
 -    };
 +    }
  
      private static class LearnMoreSpan extends URLSpan {
+         private static final String TAG = "LearnMoreSpan";
          private static final Typeface TYPEFACE_MEDIUM =
                  Typeface.create("sans-serif-medium", Typeface.NORMAL);