commit 344bc9b6f362b9239b02fa4b3fcc461ccc44d73f
author Chris Banes <chrisbanes@google.com> Fri Jun 12 10:53:34 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 12 10:53:35 2015 +0000
tree 699106d9a7b7efe2057621458a9cdf933e63291c
parent ba6f08903c8485fc02864afb4f85469fd42ae115
parent 15ed6a51e94cf108c3e5043d13e02c634c44faae

Merge "Fix Tab click not updating the visible selected Tab" into lmp-mr1-ub-dev

build.gradle

diff --git a/build.gradle b/build.gradle
index 82de0c2..5d8a0cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@
         maven { url '../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0-beta2'
     }
 }
 
@@ -166,6 +166,7 @@
     project.plugins.whenPluginAdded { plugin ->
         if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
             project.android.buildToolsVersion = rootProject.buildToolsVersion
+            project.android.aaptOptions.useNewCruncher = false
         }
     }
 }

v7/appcompat/res/values-v21/styles_base.xml

diff --git a/v7/appcompat/res/values-v21/styles_base.xml b/v7/appcompat/res/values-v21/styles_base.xml
index 1bf90ef..241cb04 100644
--- a/v7/appcompat/res/values-v21/styles_base.xml
+++ b/v7/appcompat/res/values-v21/styles_base.xml
@@ -174,6 +174,8 @@
 
     <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" />
 
+    <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText" />
+
     <style name="Base.Widget.AppCompat.RatingBar" parent="android:Widget.Material.RatingBar" />
 
     <style name="Base.Widget.AppCompat.Button" parent="android:Widget.Material.Button" />

v7/appcompat/res/values/styles.xml

diff --git a/v7/appcompat/res/values/styles.xml b/v7/appcompat/res/values/styles.xml
index b38c6ad..0ac20d5 100644
--- a/v7/appcompat/res/values/styles.xml
+++ b/v7/appcompat/res/values/styles.xml
@@ -194,9 +194,7 @@
     <style name="Widget.AppCompat.SearchView" parent="Base.Widget.AppCompat.SearchView" />
     <style name="Widget.AppCompat.SearchView.ActionBar" parent="Base.Widget.AppCompat.SearchView.ActionBar" />
 
-    <style name="Widget.AppCompat.EditText"
-           parent="Base.Widget.AppCompat.EditText">
-    </style>
+    <style name="Widget.AppCompat.EditText" parent="Base.Widget.AppCompat.EditText"/>
 
     <style name="Widget.AppCompat.CompoundButton.Switch" parent="Base.Widget.AppCompat.CompoundButton.Switch" />