kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix namespaces for showAsAction attributes to icons show in ActioBar

Browse source
This commit is contained in:
Johannes Baiter 2014-10-29 11:27:48 +01:00
parent 7d4b6683ef
commit 741ce31abb
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/menu/agp_intents.xml
View file

@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context="com.zeapo.pwdstore.AgpIntentsActivity" > tools:context="com.zeapo.pwdstore.AgpIntentsActivity" >
<item android:id="@+id/action_settings" <item android:id="@+id/action_settings"
android:title="@string/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" /> pwstore:showAsAction="never" />
</menu> </menu>

3
app/src/main/res/menu/git_clone.xml
View file

@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context="com.zeapo.pwdstore.GitHandler" > tools:context="com.zeapo.pwdstore.GitHandler" >
<item android:id="@+id/user_pref" <item android:id="@+id/user_pref"
android:title="@string/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" /> pwstore:showAsAction="never" />
</menu> </menu>

3
app/src/main/res/menu/pgp_handler.xml
View file

@ -1,9 +1,10 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context="com.zeapo.pwdstore.crypto.PgpHandler" > tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
<item android:title="Copy password" <item android:title="Copy password"
android:icon="@drawable/ico_copy" android:icon="@drawable/ico_copy"
android:showAsAction="ifRoom" pwstore:showAsAction="ifRoom"
android:id="@+id/copy_password" android:id="@+id/copy_password"
/> />
</menu> </menu>

5
app/src/main/res/menu/pwdstore.xml
View file

@ -1,10 +1,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context=".pwdstore" > tools:context=".pwdstore" >
<item android:id="@+id/menu_add_password" <item android:id="@+id/menu_add_password"
android:icon="@drawable/ico_add" android:icon="@drawable/ico_add"
android:showAsAction="always" pwstore:showAsAction="always"
android:title="New password"/> android:title="New password"/>
<!--<item android:id="@+id/menu_add_category"--> <!--<item android:id="@+id/menu_add_category"-->
@ -17,7 +18,7 @@
<item android:id="@+id/referesh" <item android:id="@+id/referesh"
android:title="Refresh list" android:title="Refresh list"
android:showAsAction="never" pwstore:showAsAction="never"
android:icon="@drawable/ico_sync"/> android:icon="@drawable/ico_sync"/>
<item android:id="@+id/user_pref" <item android:id="@+id/user_pref"