Skip to content

Commit 0fb4853

Browse files
author
Anirudh S
committed
Adding hs_ prefix to files under res/menu
This is done to prevent file-name clashes with projects that use this library.
1 parent fb8a9ce commit 0fb4853

14 files changed

+6
-6
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

helpstack/src/com/tenmiles/helpstack/activities/ArticleActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
5757
public boolean onCreateOptionsMenu(Menu menu) {
5858

5959
// Inflate the menu; this adds items to the action bar if it is present.
60-
getMenuInflater().inflate(R.menu.article, menu);
60+
getMenuInflater().inflate(R.menu.hs_article, menu);
6161
return true;
6262
}
6363

helpstack/src/com/tenmiles/helpstack/activities/IssueDetailActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void configureActionBar(ActionBar actionBar) {
5959
public boolean onCreateOptionsMenu(Menu menu) {
6060

6161
// Inflate the menu; this adds items to the action bar if it is present.
62-
getMenuInflater().inflate(R.menu.issue_detail, menu);
62+
getMenuInflater().inflate(R.menu.hs_issue_detail, menu);
6363
return true;
6464
}
6565

0 commit comments

Comments
 (0)