diff options
author | Jan-Felix Schmakeit <jfschmakeit@google.com> | 2017-01-16 01:26:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-16 01:26:36 +0000 |
commit | 524a4a56f6e63227f7341f782458884e6144fb8c (patch) | |
tree | db63bd8caa6c755c3da1f860bfaf174c57b3814e | |
parent | 4efd2ef9475757d26929ec2f3a348352daf7fdd1 (diff) | |
parent | a99d8356d6d8f80dbe65b88941a3f45555adb268 (diff) | |
download | android-524a4a56f6e63227f7341f782458884e6144fb8c.tar.gz |
Small lint fixes for FingerprintDialog sample. am: 9429c19adc
am: a99d8356d6
Change-Id: If02ae37b2f9de7ea1cbcc81603620aee8bf072bb
6 files changed, 40 insertions, 29 deletions
diff --git a/security/FingerprintDialog/Application/src/main/AndroidManifest.xml b/security/FingerprintDialog/Application/src/main/AndroidManifest.xml index 77d99497..337f6419 100644 --- a/security/FingerprintDialog/Application/src/main/AndroidManifest.xml +++ b/security/FingerprintDialog/Application/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?><!-- Copyright 2015 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,24 +13,28 @@ See the License for the specific language governing permissions and limitations under the License. --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.android.fingerprintdialog" - android:versionCode="1" - android:versionName="1.0"> +<manifest package="com.example.android.fingerprintdialog" + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:versionCode="1" + android:versionName="1.0"> - <uses-permission android:name="android.permission.USE_FINGERPRINT"/> + <uses-permission android:name="android.permission.USE_FINGERPRINT" /> <application - android:allowBackup="true" - android:label="@string/application_name" - android:icon="@mipmap/ic_launcher" - android:theme="@style/Theme.AppCompat.Light"> + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/application_name" + android:supportsRtl="true" + android:theme="@style/Theme.AppCompat.Light" + tools:ignore="GoogleAppIndexingWarning"> - <activity android:name=".MainActivity" - android:label="@string/application_name"> + <activity + android:name=".MainActivity" + android:label="@string/application_name"> <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> diff --git a/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/FingerprintAuthenticationDialogFragment.java b/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/FingerprintAuthenticationDialogFragment.java index 05375733..9f4a6841 100644 --- a/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/FingerprintAuthenticationDialogFragment.java +++ b/security/FingerprintDialog/Application/src/main/java/com/example/android/fingerprintdialog/FingerprintAuthenticationDialogFragment.java @@ -16,8 +16,8 @@ package com.example.android.fingerprintdialog; -import android.app.Activity; import android.app.DialogFragment; +import android.content.Context; import android.content.SharedPreferences; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; @@ -134,11 +134,11 @@ public class FingerprintAuthenticationDialogFragment extends DialogFragment } @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - mActivity = (MainActivity) activity; - mInputMethodManager = mActivity.getSystemService(InputMethodManager.class); - mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity); + public void onAttach(Context context) { + super.onAttach(context); + mActivity = (MainActivity) getActivity(); + mInputMethodManager = context.getSystemService(InputMethodManager.class); + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); } /** diff --git a/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml b/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml index 075899f8..f0a596fc 100644 --- a/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml +++ b/security/FingerprintDialog/Application/src/main/res/layout/activity_main.xml @@ -31,7 +31,8 @@ android:layout_marginBottom="32dp" android:layout_gravity="center_horizontal" android:scaleType="fitCenter" - android:src="@drawable/android_robot"/> + android:src="@drawable/android_robot" + android:contentDescription="@string/description_bugdroid_icon"/> <LinearLayout android:layout_width="match_parent" diff --git a/security/FingerprintDialog/Application/src/main/res/layout/fingerprint_dialog_content.xml b/security/FingerprintDialog/Application/src/main/res/layout/fingerprint_dialog_content.xml index 3929ebae..5bb65b2a 100644 --- a/security/FingerprintDialog/Application/src/main/res/layout/fingerprint_dialog_content.xml +++ b/security/FingerprintDialog/Application/src/main/res/layout/fingerprint_dialog_content.xml @@ -41,7 +41,8 @@ android:layout_alignParentStart="true" android:layout_below="@+id/fingerprint_description" android:layout_marginTop="20dp" - android:src="@drawable/ic_fp_40px" /> + android:src="@drawable/ic_fp_40px" + android:contentDescription="@string/description_fingerprint_icon"/> <TextView android:id="@+id/fingerprint_status" diff --git a/security/FingerprintDialog/Application/src/main/res/menu/menu_main.xml b/security/FingerprintDialog/Application/src/main/res/menu/menu_main.xml index 73f5e89a..6a6ba0f9 100644 --- a/security/FingerprintDialog/Application/src/main/res/menu/menu_main.xml +++ b/security/FingerprintDialog/Application/src/main/res/menu/menu_main.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (C) 2015 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +14,12 @@ ~ limitations under the License --> <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity"> - <item android:id="@+id/action_settings" android:title="@string/action_settings" - android:orderInCategory="100" android:showAsAction="never" /> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".MainActivity"> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:title="@string/action_settings" + app:showAsAction="never" /> </menu> diff --git a/security/FingerprintDialog/Application/src/main/res/values/strings.xml b/security/FingerprintDialog/Application/src/main/res/values/strings.xml index 86f200c9..b0856060 100644 --- a/security/FingerprintDialog/Application/src/main/res/values/strings.xml +++ b/security/FingerprintDialog/Application/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ <string name="cancel">Cancel</string> <string name="use_password">Use password</string> <string name="sign_in">Sign in</string> - <string name="ok">Ok</string> + <string name="ok">OK</string> <string name="password">Password</string> <string name="fingerprint_description">Confirm fingerprint to continue</string> <string name="fingerprint_hint">Touch sensor</string> @@ -45,4 +45,6 @@ <string name="use_fingerprint_in_future">Use fingerprint in the future</string> <string name="use_fingerprint_to_authenticate_title">Use fingerprint to authenticate</string> <string name="use_fingerprint_to_authenticate_key" >use_fingerprint_to_authenticate_key</string> + <string name="description_bugdroid_icon">Android bugdroid image</string> + <string name="description_fingerprint_icon">Fingerprint icon</string> </resources> |