diff --git a/core/res/res/color/primary_text_dark.xml b/core/res/res/color/primary_text_dark.xml
index 2ec46b9c3e8fd..39c9e221fc172 100644
--- a/core/res/res/color/primary_text_dark.xml
+++ b/core/res/res/color/primary_text_dark.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@android:color/bright_foreground_dark_disabled"/>
-	<item android:state_window_focused="false" android:color="@android:color/bright_foreground_dark"/>
+    <item android:state_window_focused="false" android:color="@android:color/bright_foreground_dark"/>
     <item android:state_pressed="true" android:color="@android:color/bright_foreground_dark_inverse"/>
     <item android:state_selected="true" android:color="@android:color/bright_foreground_dark_inverse"/>
     <item android:color="@android:color/bright_foreground_dark"/> <!-- not selected -->
diff --git a/core/res/res/color/primary_text_light.xml b/core/res/res/color/primary_text_light.xml
index bd9ac8bc91a38..e112034fcd828 100644
--- a/core/res/res/color/primary_text_light.xml
+++ b/core/res/res/color/primary_text_light.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@android:color/bright_foreground_light_disabled"/>
-    <item android:state_window_focused="false" android:color="@android:color/bright_foreground_light"/>
+    <item android:state_window_focused="false" android:color="@android:color/bright_foreground_light"/>
     <item android:state_pressed="true" android:color="@android:color/bright_foreground_light"/>
     <item android:state_selected="true" android:color="@android:color/bright_foreground_light"/>
     <item android:color="@android:color/bright_foreground_light"/> <!-- not selected -->
diff --git a/core/res/res/color/secondary_text_dark.xml b/core/res/res/color/secondary_text_dark.xml
index 0d96221f27317..c195ef0d305a1 100644
--- a/core/res/res/color/secondary_text_dark.xml
+++ b/core/res/res/color/secondary_text_dark.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_disabled"/>
+    <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_disabled"/>
     <item android:state_window_focused="false" android:color="@android:color/dim_foreground_dark"/>
     <item android:state_selected="true" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_inverse_disabled"/>
     <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_inverse_disabled"/>
diff --git a/core/res/res/color/secondary_text_light.xml b/core/res/res/color/secondary_text_light.xml
index 0846b5ec356c8..99249a5409ffe 100644
--- a/core/res/res/color/secondary_text_light.xml
+++ b/core/res/res/color/secondary_text_light.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/>
+    <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/>
     <item android:state_window_focused="false" android:color="@android:color/dim_foreground_light"/>
     <!-- Since there is only one selector (for both light and dark), the light's selected state shouldn't be inversed like the dark's. -->
     <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/>
diff --git a/core/res/res/color/tertiary_text_dark.xml b/core/res/res/color/tertiary_text_dark.xml
index 7ce3580f36c9f..66227bc6a53ec 100644
--- a/core/res/res/color/tertiary_text_dark.xml
+++ b/core/res/res/color/tertiary_text_dark.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="#808080"/>
-	<item android:state_window_focused="false" android:color="#808080"/>
+    <item android:state_window_focused="false" android:color="#808080"/>
     <item android:state_pressed="true" android:color="#808080"/>
     <item android:state_selected="true" android:color="@android:color/dim_foreground_light"/>
     <item android:color="#808080"/> <!-- not selected -->
diff --git a/core/res/res/color/tertiary_text_light.xml b/core/res/res/color/tertiary_text_light.xml
index 7e61fc89d8a51..ea65756d15939 100644
--- a/core/res/res/color/tertiary_text_light.xml
+++ b/core/res/res/color/tertiary_text_light.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="#808080"/>
-	<item android:state_window_focused="false" android:color="#808080"/>
+    <item android:state_window_focused="false" android:color="#808080"/>
     <item android:state_pressed="true" android:color="#808080"/>
     <item android:state_selected="true" android:color="#808080"/>
     <item android:color="#808080"/> <!-- not selected -->
diff --git a/core/res/res/drawable/btn_default.xml b/core/res/res/drawable/btn_default.xml
index b8ce2bfe9117f..476508464e2d1 100644
--- a/core/res/res/drawable/btn_default.xml
+++ b/core/res/res/drawable/btn_default.xml
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
+    <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_default_normal" />
-    <item android:state_window_focused="false" android:state_enabled="false"
+    <item android:state_window_focused="false" android:state_enabled="false"
         android:drawable="@drawable/btn_default_normal_disable" />
     <item android:state_pressed="true" 
         android:drawable="@drawable/btn_default_pressed" />
diff --git a/core/res/res/drawable/btn_default_small.xml b/core/res/res/drawable/btn_default_small.xml
index 247e9e2ae8ae7..5485ea03027b8 100644
--- a/core/res/res/drawable/btn_default_small.xml
+++ b/core/res/res/drawable/btn_default_small.xml
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
+    <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_default_small_normal" />
-    <item android:state_window_focused="false" android:state_enabled="false"
+    <item android:state_window_focused="false" android:state_enabled="false"
         android:drawable="@drawable/btn_default_small_normal_disable" />
     <item android:state_pressed="true" 
         android:drawable="@drawable/btn_default_small_pressed" />
diff --git a/core/res/res/drawable/btn_dialog.xml b/core/res/res/drawable/btn_dialog.xml
index ed4c28a32831e..d1d7e292e434b 100644
--- a/core/res/res/drawable/btn_dialog.xml
+++ b/core/res/res/drawable/btn_dialog.xml
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
+    <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_dialog_normal" />
-    <item android:state_window_focused="false" android:state_enabled="false"
+    <item android:state_window_focused="false" android:state_enabled="false"
         android:drawable="@drawable/btn_dialog_disable" />
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_dialog_pressed" />
diff --git a/core/res/res/drawable/btn_dropdown.xml b/core/res/res/drawable/btn_dropdown.xml
index 34a050407077b..d9905c6752267 100644
--- a/core/res/res/drawable/btn_dropdown.xml
+++ b/core/res/res/drawable/btn_dropdown.xml
@@ -18,7 +18,7 @@
     <item
         android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_dropdown_normal" />
-    <item
+    <item
         android:state_window_focused="false" android:state_enabled="false"
         android:drawable="@drawable/btn_dropdown_disabled" />
     <item
diff --git a/core/res/res/drawable/btn_global_search.xml b/core/res/res/drawable/btn_global_search.xml
index 531f07eb90b8e..2807a01788816 100644
--- a/core/res/res/drawable/btn_global_search.xml
+++ b/core/res/res/drawable/btn_global_search.xml
@@ -16,9 +16,9 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- TODO Need different assets for some of these button states. -->
-    <item android:state_window_focused="false" android:state_enabled="true"
+    <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_global_search_normal" />
-    <item android:state_window_focused="false" android:state_enabled="false"
+    <item android:state_window_focused="false" android:state_enabled="false"
         android:drawable="@drawable/btn_global_search_normal" />
     <item android:state_pressed="true" 
         android:drawable="@drawable/btn_default_pressed" />
diff --git a/core/res/res/drawable/btn_search_dialog.xml b/core/res/res/drawable/btn_search_dialog.xml
index b7f51875a7e39..082633ee50b88 100644
--- a/core/res/res/drawable/btn_search_dialog.xml
+++ b/core/res/res/drawable/btn_search_dialog.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     
-   <item android:state_window_focused="false" android:state_enabled="true"
+   <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_search_dialog_default" />
         
     <item android:state_pressed="true" 
diff --git a/core/res/res/drawable/btn_search_dialog_voice.xml b/core/res/res/drawable/btn_search_dialog_voice.xml
index 748aaf50849db..1a76efa79d026 100644
--- a/core/res/res/drawable/btn_search_dialog_voice.xml
+++ b/core/res/res/drawable/btn_search_dialog_voice.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     
-   <item android:state_window_focused="false" android:state_enabled="true"
+   <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/btn_search_dialog_voice_default" />
         
     <item android:state_pressed="true" 
diff --git a/core/res/res/drawable/edit_text.xml b/core/res/res/drawable/edit_text.xml
index 23a97e9ce14cc..315278d5444d6 100644
--- a/core/res/res/drawable/edit_text.xml
+++ b/core/res/res/drawable/edit_text.xml
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
+    <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/textfield_default" />
-    <item android:state_window_focused="false" android:state_enabled="false"
+    <item android:state_window_focused="false" android:state_enabled="false"
         android:drawable="@drawable/textfield_disabled" />
     <item android:state_pressed="true" android:drawable="@drawable/textfield_pressed" />
     <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_selected" />
diff --git a/core/res/res/drawable/textfield_search.xml b/core/res/res/drawable/textfield_search.xml
index 292336870f7ec..78c9486646503 100644
--- a/core/res/res/drawable/textfield_search.xml
+++ b/core/res/res/drawable/textfield_search.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     
-    <item android:state_window_focused="false" android:state_enabled="true"
+    <item android:state_window_focused="false" android:state_enabled="true"
         android:drawable="@drawable/textfield_search_default" />
         
     <item android:state_pressed="true"