Merge "Update core-ui to remove unneeded code."
diff --git a/core-ui/Android.mk b/core-ui/Android.mk
index bdad9f9..9e4ad0e 100644
--- a/core-ui/Android.mk
+++ b/core-ui/Android.mk
@@ -27,7 +27,6 @@
LOCAL_MODULE := android-support-core-ui
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := \
- $(call all-java-files-under,honeycomb) \
$(call all-java-files-under,ics) \
$(call all-java-files-under,jellybean-mr2) \
$(call all-java-files-under,api21) \
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index cb68cae..1b888a1 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -25,7 +25,6 @@
sourceSets {
main.java.srcDirs = [
- 'honeycomb',
'ics',
'jellybean-mr2',
'api21',
diff --git a/core-ui/honeycomb/android/support/v4/app/ActionBarDrawerToggleHoneycomb.java b/core-ui/ics/android/support/v4/app/ActionBarDrawerToggleIcs.java
similarity index 98%
rename from core-ui/honeycomb/android/support/v4/app/ActionBarDrawerToggleHoneycomb.java
rename to core-ui/ics/android/support/v4/app/ActionBarDrawerToggleIcs.java
index cce02d6..7826f86 100644
--- a/core-ui/honeycomb/android/support/v4/app/ActionBarDrawerToggleHoneycomb.java
+++ b/core-ui/ics/android/support/v4/app/ActionBarDrawerToggleIcs.java
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
package android.support.v4.app;
import android.R;
@@ -38,8 +37,8 @@
* in an action bar without some really gross hacks. Since the MR2 SDK is not published as of
* this writing, the new API is accessed via reflection here if available.
*/
-@RequiresApi(11)
-class ActionBarDrawerToggleHoneycomb {
+@RequiresApi(14)
+class ActionBarDrawerToggleIcs {
private static final String TAG = "ActionBarDrawerToggleHoneycomb";
private static final int[] THEME_ATTRS = new int[] {
diff --git a/core-ui/java/android/support/v4/app/ActionBarDrawerToggle.java b/core-ui/java/android/support/v4/app/ActionBarDrawerToggle.java
index 2a2c6c5..f1ed0cf 100644
--- a/core-ui/java/android/support/v4/app/ActionBarDrawerToggle.java
+++ b/core-ui/java/android/support/v4/app/ActionBarDrawerToggle.java
@@ -110,49 +110,26 @@
Object setActionBarDescription(Object info, Activity activity, int contentDescRes);
}
- private static class ActionBarDrawerToggleImplBase implements ActionBarDrawerToggleImpl {
- ActionBarDrawerToggleImplBase() {
- }
-
- @Override
- public Drawable getThemeUpIndicator(Activity activity) {
- return null;
- }
-
- @Override
- public Object setActionBarUpIndicator(Object info, Activity activity,
- Drawable themeImage, int contentDescRes) {
- // No action bar to set.
- return info;
- }
-
- @Override
- public Object setActionBarDescription(Object info, Activity activity, int contentDescRes) {
- // No action bar to set
- return info;
- }
- }
-
@RequiresApi(11)
- private static class ActionBarDrawerToggleImplHC implements ActionBarDrawerToggleImpl {
- ActionBarDrawerToggleImplHC() {
+ private static class ActionBarDrawerToggleImplIcs implements ActionBarDrawerToggleImpl {
+ ActionBarDrawerToggleImplIcs() {
}
@Override
public Drawable getThemeUpIndicator(Activity activity) {
- return ActionBarDrawerToggleHoneycomb.getThemeUpIndicator(activity);
+ return ActionBarDrawerToggleIcs.getThemeUpIndicator(activity);
}
@Override
public Object setActionBarUpIndicator(Object info, Activity activity,
Drawable themeImage, int contentDescRes) {
- return ActionBarDrawerToggleHoneycomb.setActionBarUpIndicator(info, activity,
+ return ActionBarDrawerToggleIcs.setActionBarUpIndicator(info, activity,
themeImage, contentDescRes);
}
@Override
public Object setActionBarDescription(Object info, Activity activity, int contentDescRes) {
- return ActionBarDrawerToggleHoneycomb.setActionBarDescription(info, activity,
+ return ActionBarDrawerToggleIcs.setActionBarDescription(info, activity,
contentDescRes);
}
}
@@ -185,13 +162,10 @@
private static final ActionBarDrawerToggleImpl IMPL;
static {
- final int version = Build.VERSION.SDK_INT;
- if (version >= 18) {
+ if (Build.VERSION.SDK_INT >= 18) {
IMPL = new ActionBarDrawerToggleImplJellybeanMR2();
- } else if (version >= 11) {
- IMPL = new ActionBarDrawerToggleImplHC();
} else {
- IMPL = new ActionBarDrawerToggleImplBase();
+ IMPL = new ActionBarDrawerToggleImplIcs();
}
}