Skip to content

Commit

Permalink
Merge pull request JakeWharton#970 from alexander-mironov/dev
Browse files Browse the repository at this point in the history
Test case for issue JakeWharton#969
  • Loading branch information
JakeWharton committed Jul 3, 2013
2 parents 3a1c3e5 + 858227d commit f1ebba3
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 0 deletions.
7 changes: 7 additions & 0 deletions actionbarsherlock-samples/known-bugs/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@
</intent-filter>
</activity>

<activity android:label="Issue #969" android:name=".Issue969" android:theme="@style/Theme.Issue969">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="com.actionbarsherlock.sample.knownbugs.OPEN"/>
</intent-filter>
</activity>

<!-- CLOSED BUGS -->

<activity android:label="Issue #379" android:name=".Issue379" android:theme="@style/Theme.Issue379" android:uiOptions="splitActionBarWhenNarrow">
Expand Down
10 changes: 10 additions & 0 deletions actionbarsherlock-samples/known-bugs/res/values/issue969.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Issue969" parent="@style/Theme.Sherlock">
<item name="actionMenuTextAppearance">@style/MyMenuTextAppearance</item>
<item name="android:actionMenuTextAppearance">@style/MyMenuTextAppearance</item>
</style>
<style name="MyMenuTextAppearance" parent="TextAppearance.Sherlock.Widget.ActionBar.Menu">
<item name="android:textAllCaps">false</item>
</style>
</resources>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.actionbarsherlock.sample.knownbugs;

import android.os.Bundle;
import android.widget.TextView;
import com.actionbarsherlock.app.SherlockActivity;
import com.actionbarsherlock.view.Menu;

import static com.actionbarsherlock.view.MenuItem.SHOW_AS_ACTION_ALWAYS;
import static com.actionbarsherlock.view.MenuItem.SHOW_AS_ACTION_WITH_TEXT;

public class Issue969 extends SherlockActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

TextView tv = new TextView(this);
tv.setText("TextAllCaps value is ignored on pre-ICS.");
setContentView(tv);
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
menu.add("Test").setShowAsAction(SHOW_AS_ACTION_ALWAYS | SHOW_AS_ACTION_WITH_TEXT);
return true;
}
}

0 comments on commit f1ebba3

Please sign in to comment.