diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-10-25 10:02:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-25 10:02:44 -0700 |
| commit | fce0666ff18227620c407ae4217012e7b69f6435 (patch) | |
| tree | ecf4f900c5bcbac8d6cb46e3715e83e3779da7ca /templates | |
| parent | b74c9a8afbc9740beab189d9137b9dfe079f5000 (diff) | |
| parent | 2d0e52de47d499016a0926dd4cca538fd6301128 (diff) | |
| download | sdk-fce0666ff18227620c407ae4217012e7b69f6435.zip sdk-fce0666ff18227620c407ae4217012e7b69f6435.tar.gz sdk-fce0666ff18227620c407ae4217012e7b69f6435.tar.bz2 | |
Merge "38920: Fix dropdown navigation template"
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl b/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl index f2549ad..cb0665e 100644 --- a/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl +++ b/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl @@ -1,9 +1,9 @@ package ${packageName}; -<#if minApi < 14>import android.annotation.TargetApi;</#if> +<#if minApiLevel < 14>import android.annotation.TargetApi;</#if> import android.app.ActionBar; import android.os.Bundle; -<#if minApi < 14>import android.content.Context; +<#if minApiLevel < 14>import android.content.Context; import android.os.Build;</#if> import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; @@ -43,7 +43,7 @@ public class ${activityClass} extends FragmentActivity implements ActionBar.OnNa actionBar.setListNavigationCallbacks( // Specify a SpinnerAdapter to populate the dropdown list. new ArrayAdapter<String>( - <#if minApi gte 14>actionBar.getThemedContext()<#else>getActionBarThemedContextCompat()</#if>, + <#if minApiLevel gte 14>actionBar.getThemedContext()<#else>getActionBarThemedContextCompat()</#if>, android.R.layout.simple_list_item_1, android.R.id.text1, new String[] { @@ -54,7 +54,7 @@ public class ${activityClass} extends FragmentActivity implements ActionBar.OnNa this); } - <#if minApi < 14> + <#if minApiLevel < 14> /** * Backward-compatible version of {@link ActionBar#getThemedContext()} that * simply returns the {@link android.app.Activity} if |