Clean-up pass over support lib modules

* Rename all eclair-mr1 folders and classes to gingerbread
* Switch percent to depend on support-compat instead of support-v4

Change-Id: If4f7e43f4698b08554e3a55223e2e4df61df068f
diff --git a/design/Android.mk b/design/Android.mk
index c9ba6ec..b566f54 100644
--- a/design/Android.mk
+++ b/design/Android.mk
@@ -53,11 +53,11 @@
 
 support_module_src_files += $(LOCAL_SRC_FILES)
 
-# A helper sub-library that makes direct use of Eclair MR1 APIs
+# A helper sub-library that makes direct use of Gingerbread APIs
 include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-eclair-mr1
+LOCAL_MODULE := android-support-design-gingerbread
 LOCAL_SDK_VERSION := 7
-LOCAL_SRC_FILES := $(call all-java-files-under, eclair-mr1)
+LOCAL_SRC_FILES := $(call all-java-files-under, gingerbread)
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-base
 LOCAL_JAVA_LIBRARIES := \
     android-support-design-res \
@@ -74,7 +74,7 @@
 LOCAL_MODULE := android-support-design-honeycomb
 LOCAL_SDK_VERSION := 11
 LOCAL_SRC_FILES := $(call all-java-files-under, honeycomb)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-eclair-mr1
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-gingerbread
 LOCAL_JAVA_LIBRARIES := \
     android-support-design-res \
     android-support-v4 \
diff --git a/design/build.gradle b/design/build.gradle
index a018bb1..b949d61 100644
--- a/design/build.gradle
+++ b/design/build.gradle
@@ -31,7 +31,7 @@
 
     sourceSets {
         main.manifest.srcFile 'AndroidManifest.xml'
-        main.java.srcDirs = ['base', 'eclair-mr1', 'honeycomb', 'honeycomb-mr1', 'ics', 'lollipop', 'src']
+        main.java.srcDirs = ['base', 'gingerbread', 'honeycomb', 'honeycomb-mr1', 'ics', 'lollipop', 'src']
         main.res.srcDirs 'res', 'res-public'
         main.assets.srcDir 'assets'
         main.resources.srcDir 'src'
diff --git a/design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java b/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
similarity index 97%
rename from design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java
rename to design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
index 54e99e0..70a0129 100644
--- a/design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java
+++ b/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
@@ -31,7 +31,7 @@
 import android.view.animation.Animation;
 import android.view.animation.Transformation;
 
-class FloatingActionButtonEclairMr1 extends FloatingActionButtonImpl {
+class FloatingActionButtonGingerbread extends FloatingActionButtonImpl {
 
     private int mAnimationDuration;
     private StateListAnimator mStateListAnimator;
@@ -39,7 +39,7 @@
 
     ShadowDrawableWrapper mShadowDrawable;
 
-    FloatingActionButtonEclairMr1(VisibilityAwareImageButton view,
+    FloatingActionButtonGingerbread(VisibilityAwareImageButton view,
             ShadowViewDelegate shadowViewDelegate) {
         super(view, shadowViewDelegate);
 
diff --git a/design/eclair-mr1/android/support/design/widget/ValueAnimatorCompatImplEclairMr1.java b/design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java
similarity index 97%
rename from design/eclair-mr1/android/support/design/widget/ValueAnimatorCompatImplEclairMr1.java
rename to design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java
index b4a0a57..004c952 100644
--- a/design/eclair-mr1/android/support/design/widget/ValueAnimatorCompatImplEclairMr1.java
+++ b/design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java
@@ -25,7 +25,7 @@
 /**
  * A 'fake' ValueAnimator implementation which uses a Runnable.
  */
-class ValueAnimatorCompatImplEclairMr1 extends ValueAnimatorCompat.Impl {
+class ValueAnimatorCompatImplGingerbread extends ValueAnimatorCompat.Impl {
 
     private static final int HANDLER_DELAY = 10;
     private static final int DEFAULT_DURATION = 200;
diff --git a/design/ics/android/support/design/widget/FloatingActionButtonIcs.java b/design/ics/android/support/design/widget/FloatingActionButtonIcs.java
index 4c256bc..25dd270 100644
--- a/design/ics/android/support/design/widget/FloatingActionButtonIcs.java
+++ b/design/ics/android/support/design/widget/FloatingActionButtonIcs.java
@@ -22,7 +22,7 @@
 import android.support.v4.view.ViewCompat;
 import android.view.View;
 
-class FloatingActionButtonIcs extends FloatingActionButtonEclairMr1 {
+class FloatingActionButtonIcs extends FloatingActionButtonGingerbread {
 
     private boolean mIsHiding;
 
diff --git a/design/src/android/support/design/widget/FloatingActionButton.java b/design/src/android/support/design/widget/FloatingActionButton.java
index d3b8c19..e8f36c8 100644
--- a/design/src/android/support/design/widget/FloatingActionButton.java
+++ b/design/src/android/support/design/widget/FloatingActionButton.java
@@ -769,7 +769,7 @@
         } else if (sdk >= 14) {
             return new FloatingActionButtonIcs(this, new ShadowDelegateImpl());
         } else {
-            return new FloatingActionButtonEclairMr1(this, new ShadowDelegateImpl());
+            return new FloatingActionButtonGingerbread(this, new ShadowDelegateImpl());
         }
     }
 
diff --git a/design/src/android/support/design/widget/ViewUtils.java b/design/src/android/support/design/widget/ViewUtils.java
index c27716c..4a8463e 100644
--- a/design/src/android/support/design/widget/ViewUtils.java
+++ b/design/src/android/support/design/widget/ViewUtils.java
@@ -26,7 +26,7 @@
         public ValueAnimatorCompat createAnimator() {
             return new ValueAnimatorCompat(Build.VERSION.SDK_INT >= 12
                     ? new ValueAnimatorCompatImplHoneycombMr1()
-                    : new ValueAnimatorCompatImplEclairMr1());
+                    : new ValueAnimatorCompatImplGingerbread());
         }
     };
 
diff --git a/percent/Android.mk b/percent/Android.mk
index 16afe7f..8700947 100644
--- a/percent/Android.mk
+++ b/percent/Android.mk
@@ -19,7 +19,7 @@
 #
 #   LOCAL_STATIC_ANDROID_LIBRARIES := \
 #       android-support-percent \
-#       android-support-v4
+#       android-support-compat
 #
 include $(CLEAR_VARS)
 LOCAL_USE_AAPT2 := true
diff --git a/percent/build.gradle b/percent/build.gradle
index 72304a1..b01d22f 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -3,7 +3,7 @@
 archivesBaseName = 'percent'
 
 dependencies {
-    compile project(':support-v4')
+    compile project(':support-compat')
 
     androidTestCompile ('com.android.support.test:runner:0.4.1') {
         exclude module: 'support-annotations'
diff --git a/v7/cardview/Android.mk b/v7/cardview/Android.mk
index cc51239..fd15683 100644
--- a/v7/cardview/Android.mk
+++ b/v7/cardview/Android.mk
@@ -42,11 +42,11 @@
 
 support_module_src_files += $(LOCAL_SRC_FILES)
 
-# A helper sub-library that makes direct use of Eclair MR1 APIs
+# A helper sub-library that makes direct use of Gingerbread APIs
 include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-v7-cardview-eclair-mr1
+LOCAL_MODULE := android-support-v7-cardview-gingerbread
 LOCAL_SDK_VERSION := 7
-LOCAL_SRC_FILES := $(call all-java-files-under, eclair-mr1)
+LOCAL_SRC_FILES := $(call all-java-files-under, gingerbread)
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v7-cardview-base
 LOCAL_JAVA_LIBRARIES := android-support-v7-cardview-res \
     android-support-annotations
@@ -60,7 +60,7 @@
 LOCAL_MODULE := android-support-v7-cardview-jellybean-mr1
 LOCAL_SDK_VERSION := 17
 LOCAL_SRC_FILES := $(call all-java-files-under, jellybean-mr1)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v7-cardview-eclair-mr1
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v7-cardview-gingerbread
 LOCAL_JAVA_LIBRARIES := android-support-v7-cardview-res \
     android-support-annotations
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
diff --git a/v7/cardview/build.gradle b/v7/cardview/build.gradle
index 5162e27..e9e0ab5 100644
--- a/v7/cardview/build.gradle
+++ b/v7/cardview/build.gradle
@@ -23,8 +23,8 @@
 
     sourceSets {
         main.manifest.srcFile 'AndroidManifest.xml'
-        main.java.srcDirs = ['base', 'eclair-mr1', 'jellybean-mr1', 'api21', 'src']
-        main.aidl.srcDirs = ['base', 'eclair-mr1', 'jellybean-mr1', 'api21', 'src']
+        main.java.srcDirs = ['base', 'gingerbread', 'jellybean-mr1', 'api21', 'src']
+        main.aidl.srcDirs = ['base', 'gingerbread', 'jellybean-mr1', 'api21', 'src']
         main.res.srcDirs = ['res']
 
         androidTest.setRoot('tests')
diff --git a/v7/cardview/eclair-mr1/android/support/v7/widget/CardViewEclairMr1.java b/v7/cardview/gingerbread/android/support/v7/widget/CardViewGingerbread.java
similarity index 98%
rename from v7/cardview/eclair-mr1/android/support/v7/widget/CardViewEclairMr1.java
rename to v7/cardview/gingerbread/android/support/v7/widget/CardViewGingerbread.java
index e32a0a0..7c1d99b 100644
--- a/v7/cardview/eclair-mr1/android/support/v7/widget/CardViewEclairMr1.java
+++ b/v7/cardview/gingerbread/android/support/v7/widget/CardViewGingerbread.java
@@ -24,7 +24,7 @@
 import android.support.annotation.ColorInt;
 import android.support.annotation.Nullable;
 
-class CardViewEclairMr1 implements CardViewImpl {
+class CardViewGingerbread implements CardViewImpl {
 
     final RectF sCornerRect = new RectF();
 
diff --git a/v7/cardview/eclair-mr1/android/support/v7/widget/RoundRectDrawableWithShadow.java b/v7/cardview/gingerbread/android/support/v7/widget/RoundRectDrawableWithShadow.java
similarity index 100%
rename from v7/cardview/eclair-mr1/android/support/v7/widget/RoundRectDrawableWithShadow.java
rename to v7/cardview/gingerbread/android/support/v7/widget/RoundRectDrawableWithShadow.java
diff --git a/v7/cardview/jellybean-mr1/android/support/v7/widget/CardViewJellybeanMr1.java b/v7/cardview/jellybean-mr1/android/support/v7/widget/CardViewJellybeanMr1.java
index bb38a3c..4c32227 100644
--- a/v7/cardview/jellybean-mr1/android/support/v7/widget/CardViewJellybeanMr1.java
+++ b/v7/cardview/jellybean-mr1/android/support/v7/widget/CardViewJellybeanMr1.java
@@ -19,7 +19,7 @@
 import android.graphics.Paint;
 import android.graphics.RectF;
 
-class CardViewJellybeanMr1 extends CardViewEclairMr1 {
+class CardViewJellybeanMr1 extends CardViewGingerbread {
 
     @Override
     public void initStatic() {
diff --git a/v7/cardview/src/android/support/v7/widget/CardView.java b/v7/cardview/src/android/support/v7/widget/CardView.java
index ecd0a10..3da3243 100644
--- a/v7/cardview/src/android/support/v7/widget/CardView.java
+++ b/v7/cardview/src/android/support/v7/widget/CardView.java
@@ -84,7 +84,7 @@
         } else if (Build.VERSION.SDK_INT >= 17) {
             IMPL = new CardViewJellybeanMr1();
         } else {
-            IMPL = new CardViewEclairMr1();
+            IMPL = new CardViewGingerbread();
         }
         IMPL.initStatic();
     }