Skip to content

Commit

Permalink
Replace android:showAsAction with app:showAsAction
Browse files Browse the repository at this point in the history
  • Loading branch information
dnlplm committed May 26, 2023
1 parent 99b7dde commit 7166208
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
11 changes: 6 additions & 5 deletions app/src/main/res/menu/capture.xml
Expand Up @@ -14,25 +14,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_share"
android:title="@string/menu_share"
android:icon="@android:drawable/ic_menu_share"
android:orderInCategory="1"
android:showAsAction="withText|ifRoom"/>
app:showAsAction="withText|ifRoom" />
<item android:id="@+id/menu_history"
android:title="@string/menu_history"
android:icon="@android:drawable/ic_menu_recent_history"
android:orderInCategory="2"
android:showAsAction="withText|ifRoom"/>
app:showAsAction="withText|ifRoom" />
<item android:id="@+id/menu_settings"
android:title="@string/menu_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:orderInCategory="3"
android:showAsAction="withText"/>
app:showAsAction="withText" />
<item android:id="@+id/menu_help"
android:title="@string/menu_help"
android:icon="@android:drawable/ic_menu_help"
android:orderInCategory="4"
android:showAsAction="withText"/>
app:showAsAction="withText" />
</menu>
7 changes: 4 additions & 3 deletions app/src/main/res/menu/encode.xml
Expand Up @@ -14,15 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_share"
android:title="@string/menu_share"
android:icon="@android:drawable/ic_menu_share"
android:orderInCategory="1"
android:showAsAction="withText|ifRoom"/>
app:showAsAction="withText|ifRoom" />
<item android:id="@+id/menu_encode"
android:title="@string/menu_encode_vcard"
android:icon="@android:drawable/ic_menu_sort_alphabetically"
android:orderInCategory="2"
android:showAsAction="withText|ifRoom"/>
app:showAsAction="withText|ifRoom" />
</menu>
7 changes: 4 additions & 3 deletions app/src/main/res/menu/history.xml
Expand Up @@ -14,15 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_history_send"
android:title="@string/history_send"
android:icon="@android:drawable/ic_menu_share"
android:orderInCategory="1"
android:showAsAction="withText|ifRoom"/>
app:showAsAction="withText|ifRoom" />
<item android:id="@+id/menu_history_clear_text"
android:title="@string/history_clear_text"
android:icon="@android:drawable/ic_menu_delete"
android:orderInCategory="2"
android:showAsAction="withText|ifRoom"/>
app:showAsAction="withText|ifRoom" />
</menu>

0 comments on commit 7166208

Please sign in to comment.