drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2015-11-17 20:22:43 +00:00
committed by Android (Google) Code Review
parent 22931224d9 99b54b364b
commit 42a893b50b
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java
View File

@ -76,19 +76,18 @@ public class AppCompatActionBar extends BridgeActionBar {
Class[] constructorParams = {View.class}; Class[] constructorParams = {View.class};
Object[] constructorArgs = {getDecorContent()}; Object[] constructorArgs = {getDecorContent()};
LayoutlibCallback callback = params.getLayoutlibCallback(); LayoutlibCallback callback = params.getLayoutlibCallback();
// First try to load the class as was available before appcompat v23.1.1, without
// logging warnings. // Check if the old action bar class is present.
String actionBarClass = WINDOW_ACTION_BAR_CLASS;
try { try {
mWindowDecorActionBar = callback.loadClass(WINDOW_ACTION_BAR_CLASS, callback.findClass(actionBarClass);
constructorParams, constructorArgs); } catch (ClassNotFoundException expected) {
} catch (ClassNotFoundException ignore) { // Failed to find the old class, use the newer one.
} actionBarClass = WINDOW_ACTION_BAR_CLASS_NEW;
if (mWindowDecorActionBar == null) {
// If failed, load the new class, while logging warnings.
mWindowDecorActionBar = callback.loadView(WINDOW_ACTION_BAR_CLASS_NEW,
constructorParams, constructorArgs);
} }
mWindowDecorActionBar = callback.loadView(actionBarClass,
constructorParams, constructorArgs);
mWindowActionBarClass = mWindowDecorActionBar == null ? null : mWindowActionBarClass = mWindowDecorActionBar == null ? null :
mWindowDecorActionBar.getClass(); mWindowDecorActionBar.getClass();
setupActionBar(); setupActionBar();