am 9bd9831d: Non-reflection based implementation for drawer toggle for JBMR2+.
* commit '9bd9831d1f3b23c72f67a4bf5d2b2504046bc771':
Non-reflection based implementation for drawer toggle for JBMR2+.
diff --git a/v4/java/android/support/v4/app/ActionBarDrawerToggle.java b/v4/java/android/support/v4/app/ActionBarDrawerToggle.java
index 000af54..5c7e733 100644
--- a/v4/java/android/support/v4/app/ActionBarDrawerToggle.java
+++ b/v4/java/android/support/v4/app/ActionBarDrawerToggle.java
@@ -137,11 +137,34 @@
}
}
+ private static class ActionBarDrawerToggleImplJellybeanMR2
+ implements ActionBarDrawerToggleImpl {
+ @Override
+ public Drawable getThemeUpIndicator(Activity activity) {
+ return ActionBarDrawerToggleJellybeanMR2.getThemeUpIndicator(activity);
+ }
+
+ @Override
+ public Object setActionBarUpIndicator(Object info, Activity activity,
+ Drawable themeImage, int contentDescRes) {
+ return ActionBarDrawerToggleJellybeanMR2.setActionBarUpIndicator(info, activity,
+ themeImage, contentDescRes);
+ }
+
+ @Override
+ public Object setActionBarDescription(Object info, Activity activity, int contentDescRes) {
+ return ActionBarDrawerToggleJellybeanMR2.setActionBarDescription(info, activity,
+ contentDescRes);
+ }
+ }
+
private static final ActionBarDrawerToggleImpl IMPL;
static {
final int version = Build.VERSION.SDK_INT;
- if (version >= 11) {
+ if (version >= 18) {
+ IMPL = new ActionBarDrawerToggleImplJellybeanMR2();
+ } else if (version >= 11) {
IMPL = new ActionBarDrawerToggleImplHC();
} else {
IMPL = new ActionBarDrawerToggleImplBase();
diff --git a/v4/jellybean-mr2/android/support/v4/app/ActionBarDrawerToggleJellybeanMR2.java b/v4/jellybean-mr2/android/support/v4/app/ActionBarDrawerToggleJellybeanMR2.java
new file mode 100644
index 0000000..a470a2d
--- /dev/null
+++ b/v4/jellybean-mr2/android/support/v4/app/ActionBarDrawerToggleJellybeanMR2.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package android.support.v4.app;
+
+import android.R;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.Log;
+
+class ActionBarDrawerToggleJellybeanMR2 {
+ private static final String TAG = "ActionBarDrawerToggleImplJellybeanMR2";
+
+ private static final int[] THEME_ATTRS = new int[] {
+ R.attr.homeAsUpIndicator
+ };
+
+ public static Object setActionBarUpIndicator(Object info, Activity activity,
+ Drawable drawable, int contentDescRes) {
+ final ActionBar actionBar = activity.getActionBar();
+ if (actionBar != null) {
+ actionBar.setHomeAsUpIndicator(drawable);
+ actionBar.setHomeActionContentDescription(contentDescRes);
+ }
+ return info;
+ }
+
+ public static Object setActionBarDescription(Object info, Activity activity,
+ int contentDescRes) {
+ final ActionBar actionBar = activity.getActionBar();
+ if (actionBar != null) {
+ actionBar.setHomeActionContentDescription(contentDescRes);
+ }
+ return info;
+ }
+
+ public static Drawable getThemeUpIndicator(Activity activity) {
+ final TypedArray a = activity.obtainStyledAttributes(THEME_ATTRS);
+ final Drawable result = a.getDrawable(0);
+ a.recycle();
+ return result;
+ }
+}