equal
deleted
inserted
replaced
204 } |
204 } |
205 return false; |
205 return false; |
206 } |
206 } |
207 |
207 |
208 /** |
208 /** |
209 * Callback for menu creation. <<<<<<< local |
209 * Callback for menu creation. |
210 * @param menu the menu created ======= |
210 * @param The created menu |
211 * @param menu The created menu >>>>>>> other |
|
212 * @return true on success, false otherwise |
211 * @return true on success, false otherwise |
213 */ |
212 */ |
214 @Override |
213 @Override |
215 public final boolean onCreateOptionsMenu(Menu menu) { |
214 public final boolean onCreateOptionsMenu(Menu menu) { |
216 super.onCreateOptionsMenu(menu); |
215 super.onCreateOptionsMenu(menu); |