Merge "Updated icon for Autofill sample." into oc-dev

18 files changed, 77 insertions, 19 deletions

diff --git a/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml b/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml
index d17dce13..28d9c0b5 100644
--- a/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml
+++ b/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light">
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.java
index 9fc87969..768b2ee3 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.java
@@ -103,8 +103,6 @@ public class AuthActivity extends Activity {
 
     private void login() {
         Editable password = mMasterPassword.getText();
-        Log.d(TAG, "PW entered: " + password);
-        Log.d(TAG, "Correct: " + MyPreferences.getInstance(AuthActivity.this).getMasterPassword());
         if (password.toString()
                 .equals(MyPreferences.getInstance(AuthActivity.this).getMasterPassword())) {
             onSuccess();
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.java
index c79f61dc..8de8b647 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.java
@@ -35,7 +35,7 @@ public interface AutofillRepository {
     void saveClientFormData(ClientFormData clientFormData);
 
     /**
-     * Clear all data.
+     * Clears all data.
      */
     void clear();
 }
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.java
index 21bb7be0..6387d36b 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.java
@@ -75,7 +75,7 @@ public class SettingsActivity extends AppCompatActivity {
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        if (MyPreferences.getInstance(SettingsActivity.this).getMasterPassword() != null) {
+                        if (preferences.getMasterPassword() != null) {
                             buildCurrentCredentialsDialog().show();
                         } else {
                             buildNewCredentialsDialog().show();
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/drawable-hdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b1efaf4b..00000000
--- a/input/autofill/AutofillFramework/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/drawable-mdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f5f9244f..00000000
--- a/input/autofill/AutofillFramework/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d07b3f0..00000000
--- a/input/autofill/AutofillFramework/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6ef21e1f..00000000
--- a/input/autofill/AutofillFramework/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_delete_forever_black_24dp.xml b/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_delete_forever_black_24dp.xml
index 06d61218..4d2afb01 100644
--- a/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_delete_forever_black_24dp.xml
+++ b/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_delete_forever_black_24dp.xml
@@ -1,3 +1,18 @@
+<!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
 <vector android:alpha="0.50" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_person_black_24dp.xml b/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_person_black_24dp.xml
index 7a0dcd36..6534d9f0 100644
--- a/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_person_black_24dp.xml
+++ b/input/autofill/AutofillFramework/Application/src/main/res/drawable/ic_person_black_24dp.xml
@@ -1,3 +1,18 @@
+<!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
 <vector android:alpha="0.50" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_activity.xml b/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_activity.xml
index 5a3076da..3704e40f 100644
--- a/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_activity.xml
+++ b/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_activity.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2017 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
 <android.support.v4.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_authentication_dialog.xml b/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_authentication_dialog.xml
index edb293f1..93ac6dd1 100644
--- a/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_authentication_dialog.xml
+++ b/input/autofill/AutofillFramework/Application/src/main/res/layout/settings_authentication_dialog.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
 <EditText xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@+id/master_password_field"
           android:layout_width="match_parent"
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/mipmap-hdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 00000000..93465c02
--- /dev/null
+++ b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/mipmap-mdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 00000000..6d5c2bb9
--- /dev/null
+++ b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xhdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 00000000..72ecd6c7
--- /dev/null
+++ b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 00000000..698fd4c5
--- /dev/null
+++ b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 00000000..b64a676b
--- /dev/null
+++ b/input/autofill/AutofillFramework/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml b/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml
index 73fccaf3..92aabaa6 100644
--- a/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml
+++ b/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
 <resources>
     <style name="Settings.Label" parent="">
         <item name="android:ellipsize">end</item>