forked from upstream-mirrors/quik
Fixed menu item coloring
This commit is contained in:
@@ -256,12 +256,6 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPrepareOptionsMenu(Menu menu) {
|
public boolean onPrepareOptionsMenu(Menu menu) {
|
||||||
MenuInflater inflater = getMenuInflater();
|
MenuInflater inflater = getMenuInflater();
|
||||||
@@ -276,7 +270,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen
|
|||||||
mContent.inflateToolbar(menu, inflater, this);
|
mContent.inflateToolbar(menu, inflater, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return super.onPrepareOptionsMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Fragment getConversationList() {
|
public Fragment getConversationList() {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import com.moez.QKSMS.ui.view.QKTextView;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class QKActivity extends ActionBarActivity {
|
public abstract class QKActivity extends ActionBarActivity {
|
||||||
private final String TAG = "QKActivity";
|
private final String TAG = "QKActivity";
|
||||||
|
|
||||||
private Toolbar mToolbar;
|
private Toolbar mToolbar;
|
||||||
@@ -151,12 +151,11 @@ public class QKActivity extends ActionBarActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onPrepareOptionsMenu(Menu menu) {
|
||||||
// Save a reference to the menu so that we can quickly access menu icons later.
|
// Save a reference to the menu so that we can quickly access menu icons later.
|
||||||
mMenu = menu;
|
mMenu = menu;
|
||||||
colorMenuIcons(mMenu, ThemeManager.getTextOnColorPrimary());
|
colorMenuIcons(mMenu, ThemeManager.getTextOnColorPrimary());
|
||||||
|
return true;
|
||||||
return super.onCreateOptionsMenu(mMenu);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user