diff options
| author | zeapo <mohamed@zenadi.com> | 2014-10-29 22:08:01 +0100 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2014-10-29 22:08:01 +0100 |
| commit | 892cd1b4d3b9f6474522d389ac2ea7b21c27c97b (patch) | |
| tree | 527bc7871005343c180a142648a9b16f8e110d9c /app/src/main/res | |
| parent | 021bec9f92ede8777930d400e27eacc37e5c1266 (diff) | |
| parent | a05a4a42df17b8dee25252b7cdfbb93a17b46943 (diff) | |
Merge branch 'filterlist' of git://github.com/jbaiter/Android-Password-Store into jbaiter-filterlist
- Corrected some issues due to the lack of comments
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable-hdpi/ic_action_search.png | bin | 0 -> 650 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-mdpi/ic_action_search.png | bin | 0 -> 449 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_action_search.png | bin | 0 -> 827 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xxhdpi/ic_action_search.png | bin | 0 -> 1152 bytes | |||
| -rw-r--r-- | app/src/main/res/menu/pwdstore.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
6 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png Binary files differnew file mode 100644 index 00000000..772e3598 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png Binary files differnew file mode 100644 index 00000000..4edb1ff9 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png Binary files differnew file mode 100644 index 00000000..19658e4a --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png Binary files differnew file mode 100644 index 00000000..a1086388 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_search.png diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml index d6f81b73..d5d4361d 100644 --- a/app/src/main/res/menu/pwdstore.xml +++ b/app/src/main/res/menu/pwdstore.xml @@ -3,9 +3,15 @@ xmlns:pwstore="http://schemas.android.com/apk/res-auto" tools:context=".pwdstore" > + <item android:id="@+id/action_search" + android:title="@string/action_search" + android:icon="@drawable/ic_action_search" + pwstore:showAsAction="ifRoom|collapseActionView" + pwstore:actionViewClass="android.support.v7.widget.SearchView" /> + <item android:id="@+id/menu_add_password" android:icon="@drawable/ico_add" - pwstore:showAsAction="always" + pwstore:showAsAction="ifRoom" android:title="New password"/> <!--<item android:id="@+id/menu_add_category"--> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c35514ec..07c6b3fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,6 +42,7 @@ <!-- DECRYPT Layout --> <string name="crypto_category">Category</string> + <string name="action_search">Search</string> </resources> |
