summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-04-02 12:56:56 -0700
committerMichael Bestas <mikeioannina@gmail.com>2015-12-28 16:28:28 +0200
commit77450bee72811e0bf4a310acee2956d4de36c2d9 (patch)
tree41d9fa1827cc5b188b27cf03987ee82e46257fd8
parent52e7a402a1dba1ab19028177d2324be5676eba80 (diff)
downloadpackages_apps_Settings-77450bee72811e0bf4a310acee2956d4de36c2d9.zip
packages_apps_Settings-77450bee72811e0bf4a310acee2956d4de36c2d9.tar.gz
packages_apps_Settings-77450bee72811e0bf4a310acee2956d4de36c2d9.tar.bz2
Settings: improve empty Profile trigger icons
The icons that were used were being scaled up and looked choppy and ugly. Use some vector drawables instead. Signed-off-by: Roman Birg <roman@cyngn.com> Change-Id: Ia66d79f706f5de5b835fdcc503f1e92944e8b7dd
-rw-r--r--res/drawable-hdpi/nfc_writer.pngbin6902 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/nfc_writer.pngbin6877 -> 0 bytes
-rw-r--r--res/drawable/ic_bluetooth_48px.xml28
-rw-r--r--res/drawable/ic_local_offer_48px.xml29
-rw-r--r--res/drawable/ic_signal_wifi_4_bar_48px.xml27
-rw-r--r--res/layout-land-hdpi/nfc_writer.xml58
-rw-r--r--res/layout-land-hdpi/profile_bluetooth_empty_view.xml2
-rw-r--r--res/layout-land-hdpi/profile_wifi_empty_view.xml2
-rw-r--r--res/layout/nfc_writer.xml2
-rw-r--r--res/layout/profile_bluetooth_empty_view.xml2
-rw-r--r--res/layout/profile_wifi_empty_view.xml2
11 files changed, 147 insertions, 5 deletions
diff --git a/res/drawable-hdpi/nfc_writer.png b/res/drawable-hdpi/nfc_writer.png
deleted file mode 100644
index 873e721..0000000
--- a/res/drawable-hdpi/nfc_writer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/nfc_writer.png b/res/drawable-xhdpi/nfc_writer.png
deleted file mode 100644
index 60f4d6e..0000000
--- a/res/drawable-xhdpi/nfc_writer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_bluetooth_48px.xml b/res/drawable/ic_bluetooth_48px.xml
new file mode 100644
index 0000000..94a5cc7
--- /dev/null
+++ b/res/drawable/ic_bluetooth_48px.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015 The CyanogenMod Project
+
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="@color/theme_accent"
+ android:pathData="M35.41 15.41L24 4h-2v15.17L12.83 10 10 12.83 21.17 24 10 35.17 12.83 38 22
+28.83V44h2l11.41-11.41L26.83 24l8.58-8.59zM26 11.66l3.76 3.76L26
+19.17v-7.51zm3.76 20.93L26 36.34v-7.52l3.76 3.77z" />
+</vector> \ No newline at end of file
diff --git a/res/drawable/ic_local_offer_48px.xml b/res/drawable/ic_local_offer_48px.xml
new file mode 100644
index 0000000..be20381
--- /dev/null
+++ b/res/drawable/ic_local_offer_48px.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015 The CyanogenMod Project
+
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="@color/theme_accent"
+ android:pathData="M42.82 23.16L24.83 5.17C24.1 4.45 23.1 4 22 4H8C5.79 4 4 5.79 4 8v14c0 1.11 .45
+2.11 1.18 2.83l18 18C23.9 43.55 24.9 44 26 44c1.1 0 2.11-.45
+2.83-1.17l14-14C43.55 28.1 44 27.1 44 26c0-1.11-.45-2.11-1.18-2.84zM11 14c-1.66
+0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z" />
+</vector> \ No newline at end of file
diff --git a/res/drawable/ic_signal_wifi_4_bar_48px.xml b/res/drawable/ic_signal_wifi_4_bar_48px.xml
new file mode 100644
index 0000000..8f978ee
--- /dev/null
+++ b/res/drawable/ic_signal_wifi_4_bar_48px.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015 The CyanogenMod Project
+
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="@color/theme_accent"
+ android:pathData="M24.02 42.98L47.28 14c-.9-.68-9.85-8-23.28-8S1.62 13.32 .72 14l23.26 28.98 .02
+.02 .02 -.02z" />
+</vector> \ No newline at end of file
diff --git a/res/layout-land-hdpi/nfc_writer.xml b/res/layout-land-hdpi/nfc_writer.xml
new file mode 100644
index 0000000..4428c1d
--- /dev/null
+++ b/res/layout-land-hdpi/nfc_writer.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The CyanogenMod Project
+
+ 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.
+-->
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center">
+
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:layout_centerInParent="true">
+
+ <TextView
+ style="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
+ android:layout_marginBottom="30dip"
+ android:layout_gravity="center"
+ android:text="@string/profile_nfc_text" />
+
+ <ImageView
+ android:id="@+id/nfc_writer_image"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:layout_gravity="center"
+ android:tint="@color/theme_accent"
+ android:src="@drawable/ic_local_offer_48px" />
+
+ <TextView android:id="@+id/touch_tag"
+ style="?android:attr/textAppearanceLarge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dip"
+ android:layout_gravity="center"
+ android:text="@string/profile_write_touch_tag" />
+
+ </LinearLayout>
+</RelativeLayout>
diff --git a/res/layout-land-hdpi/profile_bluetooth_empty_view.xml b/res/layout-land-hdpi/profile_bluetooth_empty_view.xml
index e653dd4..4557f5f 100644
--- a/res/layout-land-hdpi/profile_bluetooth_empty_view.xml
+++ b/res/layout-land-hdpi/profile_bluetooth_empty_view.xml
@@ -28,7 +28,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
- android:src="@drawable/ic_settings_bluetooth" />
+ android:src="@drawable/ic_bluetooth_48px" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout-land-hdpi/profile_wifi_empty_view.xml b/res/layout-land-hdpi/profile_wifi_empty_view.xml
index 6f29c37..cc7d4d7 100644
--- a/res/layout-land-hdpi/profile_wifi_empty_view.xml
+++ b/res/layout-land-hdpi/profile_wifi_empty_view.xml
@@ -28,7 +28,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
- android:src="@drawable/ic_wifi_signal_4" />
+ android:src="@drawable/ic_signal_wifi_4_bar_48px" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/nfc_writer.xml b/res/layout/nfc_writer.xml
index d322fa8..c3f35fe 100644
--- a/res/layout/nfc_writer.xml
+++ b/res/layout/nfc_writer.xml
@@ -44,7 +44,7 @@
android:layout_height="84dp"
android:layout_gravity="center"
android:tint="@color/theme_accent"
- android:src="@drawable/nfc_writer" />
+ android:src="@drawable/ic_local_offer_48px" />
<TextView android:id="@+id/touch_tag"
style="?android:attr/textAppearanceLarge"
diff --git a/res/layout/profile_bluetooth_empty_view.xml b/res/layout/profile_bluetooth_empty_view.xml
index 2165c9a..777ae3b 100644
--- a/res/layout/profile_bluetooth_empty_view.xml
+++ b/res/layout/profile_bluetooth_empty_view.xml
@@ -28,7 +28,7 @@
android:layout_width="84dp"
android:layout_height="84dp"
android:layout_gravity="center"
- android:src="@drawable/ic_settings_bluetooth" />
+ android:src="@drawable/ic_bluetooth_48px" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/profile_wifi_empty_view.xml b/res/layout/profile_wifi_empty_view.xml
index 83ffac9..9330f53 100644
--- a/res/layout/profile_wifi_empty_view.xml
+++ b/res/layout/profile_wifi_empty_view.xml
@@ -28,7 +28,7 @@
android:layout_width="84dp"
android:layout_height="84dp"
android:layout_gravity="center"
- android:src="@drawable/ic_wifi_signal_4" />
+ android:src="@drawable/ic_signal_wifi_4_bar_48px" />
</LinearLayout>
</RelativeLayout>