aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-01-17 14:47:34 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-01-17 14:47:34 +0100
commit3cd36637eb3b5de54f5e4495a22ce8907eaf9655 (patch)
treed0fbec8bcd0486d180331ddd212c483a65b808ae
parentf334dea1b52c40a6737caabdb65b562b6038e6c3 (diff)
downloadopen-keychain-3cd36637eb3b5de54f5e4495a22ce8907eaf9655.tar.gz
open-keychain-3cd36637eb3b5de54f5e4495a22ce8907eaf9655.tar.bz2
open-keychain-3cd36637eb3b5de54f5e4495a22ce8907eaf9655.zip
new import icon
-rw-r--r--OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.pngbin4241 -> 0 bytes
-rw-r--r--OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.pngbin4418 -> 0 bytes
-rw-r--r--OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml28
-rw-r--r--OpenPGP-Keychain/res/layout/main.xml2
4 files changed, 1 insertions, 29 deletions
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png
deleted file mode 100644
index 632a8ce62..000000000
--- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png
+++ /dev/null
Binary files differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
deleted file mode 100644
index 62a7a05ab..000000000
--- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
+++ /dev/null
Binary files differ
diff --git a/OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml b/OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml
deleted file mode 100644
index 400994820..000000000
--- a/OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- Copyright 2011 Google Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/dashboard_scan_qrcode_pressed"
- android:state_focused="true"
- android:state_pressed="true" />
- <item android:drawable="@drawable/dashboard_scan_qrcode_pressed"
- android:state_focused="false"
- android:state_pressed="true" />
- <item android:drawable="@drawable/dashboard_scan_qrcode_pressed"
- android:state_focused="true" />
- <item android:drawable="@drawable/dashboard_scan_qrcode_default"
- android:state_focused="false"
- android:state_pressed="false" />
-</selector>
diff --git a/OpenPGP-Keychain/res/layout/main.xml b/OpenPGP-Keychain/res/layout/main.xml
index e5a76e5b5..71967271b 100644
--- a/OpenPGP-Keychain/res/layout/main.xml
+++ b/OpenPGP-Keychain/res/layout/main.xml
@@ -55,7 +55,7 @@
<Button
android:id="@+id/dashboard_scan_qrcode"
style="@style/DashboardButton"
- android:drawableTop="@drawable/dashboard_scan_qrcode"
+ android:drawableTop="@drawable/dashboard_import"
android:onClick="scanQrcodeOnClick"
android:text="@string/dashboard_import_keys" />