From ffd328b07132ae98646067c2540ad67fc6730391 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 9 Jan 2017 10:16:49 -0800
Subject: [PATCH] Misc fixes for IA and pattern.

Disable NFC fragments when feature is not avaiable
Link to spell checker screen with the pref is clicked
Tint "add"/"delete" button in UserDictionary actionbar to proper color.

Change-Id: I8a8e219ce3dbbafc6c4d5a0f34f835ffd0abad4f
Fix: 34155679
Fix: 34161006
Fix: 34154795
Test: RunSettingsRoboTests
---
 res/drawable/ic_menu_add_white.xml                          | 6 ++++--
 res/xml/language_and_region.xml                             | 3 ++-
 src/com/android/settings/SettingsActivity.java              | 5 +++++
 .../settings/inputmethod/UserDictionaryAddWordFragment.java | 2 +-
 .../inputmethod/SpellCheckerPreferenceControllerTest.java   | 5 ++---
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/res/drawable/ic_menu_add_white.xml b/res/drawable/ic_menu_add_white.xml
index 9a06d5cbca5..25a8ff0fd1a 100644
--- a/res/drawable/ic_menu_add_white.xml
+++ b/res/drawable/ic_menu_add_white.xml
@@ -15,11 +15,13 @@
      limitations under the License.
 -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/res/xml/language_and_region.xml b/res/xml/language_and_region.xml
index 62179c92298..faf0ecd349a 100644
--- a/res/xml/language_and_region.xml
+++ b/res/xml/language_and_region.xml
@@ -28,7 +28,8 @@
     <Preference
         android:key="spellcheckers_settings"
         android:title="@string/spellcheckers_settings_title"
-        android:persistent="false"/>
+        android:persistent="false"
+        android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"/>
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <Preference
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 33c8eca83e0..2ca0d4bf71d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -974,6 +974,11 @@ public class SettingsActivity extends SettingsDrawerActivity
                 pm.hasSystemFeature(PackageManager.FEATURE_NFC)
                         && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
                         && adapter != null && adapter.isEnabled(), isAdmin);
+        setTileEnabled(new ComponentName(packageName,
+                        "com.android.settings.PaymentSettingsDashboardAlias"),
+                pm.hasSystemFeature(PackageManager.FEATURE_NFC)
+                        && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
+                        && adapter != null && adapter.isEnabled(), isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
                 Settings.PrintSettingsActivity.class.getName()),
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index 0d30bccdf04..38b64a598db 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -86,7 +86,7 @@ public class UserDictionaryAddWordFragment extends InstrumentedPreferenceFragmen
     @Override
     public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         MenuItem actionItem = menu.add(0, OPTIONS_MENU_DELETE, 0, R.string.delete)
-                .setIcon(android.R.drawable.ic_menu_delete);
+                .setIcon(R.drawable.ic_delete);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index 78c05901d15..8ca7d64cdd8 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -31,8 +31,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
@@ -53,7 +53,7 @@ public class SpellCheckerPreferenceControllerTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mAppContext = ShadowApplication.getInstance().getApplicationContext();
+        mAppContext = RuntimeEnvironment.application;
         when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
                 .thenReturn(mTextServicesManager);
         mPreference = new Preference(mAppContext);
@@ -76,7 +76,6 @@ public class SpellCheckerPreferenceControllerTest {
         when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(false);
 
         mController.updateState(mPreference);
-
         assertThat(mPreference.getSummary())
                 .isEqualTo(mAppContext.getString(R.string.switch_off_text));
     }