summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-11-27 06:01:50 +0200
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-05-28 21:08:13 +0300
commit053ce97c686ca6f89b571e44625844691efb3176 (patch)
treec7c76db04a6eba009d3e7a98b2fd0b8099256391
parent65aaf67498f43f05660c90fb3780fa979c95888c (diff)
downloadandroid_packages_apps_Stk-053ce97c686ca6f89b571e44625844691efb3176.tar.gz
android_packages_apps_Stk-053ce97c686ca6f89b571e44625844691efb3176.tar.bz2
android_packages_apps_Stk-053ce97c686ca6f89b571e44625844691efb3176.zip
Stk: Materialize message dialog icon
* Also fix the broken layout Change-Id: Ic733a71245ad9699124b8494beac0e98e28117b9
-rw-r--r--res/drawable/ic_dialog_sim.xml13
-rw-r--r--res/layout/stk_msg_dialog.xml13
-rw-r--r--res/values/cm_colors.xml2
-rw-r--r--src/com/android/stk/StkDialogActivity.java2
4 files changed, 24 insertions, 6 deletions
diff --git a/res/drawable/ic_dialog_sim.xml b/res/drawable/ic_dialog_sim.xml
new file mode 100644
index 0000000..2cebdea
--- /dev/null
+++ b/res/drawable/ic_dialog_sim.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1 .9 2 2 2h12.01c1.1 0 1.99-.9
+1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4
+4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z" />
+</vector>
diff --git a/res/layout/stk_msg_dialog.xml b/res/layout/stk_msg_dialog.xml
index fa28237..1624601 100644
--- a/res/layout/stk_msg_dialog.xml
+++ b/res/layout/stk_msg_dialog.xml
@@ -23,22 +23,25 @@
<LinearLayout android:id="@+id/titleBar"
android:layout_width="match_parent"
- android:layout_height="50dp"
- android:orientation="horizontal">
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingTop="14dip"
+ android:paddingStart="14dip"
+ android:paddingEnd="19dip">
<ImageView android:id="@+id/icon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="8dp"/>
+ android:layout_centerVertical="true" />
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
style="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
- android:padding="5dip"/>
+ android:paddingStart="10dip" />
</LinearLayout>
+
<LinearLayout android:id="@+id/messagePanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 1c5dc9f..9cfef79 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -19,4 +19,6 @@
<color name="theme_primary">#ff263238</color>
<color name="theme_primary_dark">#ff21272b</color>
<color name="theme_accent">#ff009688</color>
+
+ <color name="white">#fafafa</color>
</resources>
diff --git a/src/com/android/stk/StkDialogActivity.java b/src/com/android/stk/StkDialogActivity.java
index 2b7cfee..1f63f10 100644
--- a/src/com/android/stk/StkDialogActivity.java
+++ b/src/com/android/stk/StkDialogActivity.java
@@ -149,7 +149,7 @@ public class StkDialogActivity extends Activity implements View.OnClickListener
ImageView imageView = (ImageView) findViewById(R.id.icon);
if (mTextMsg.icon == null) {
imageView.setContentDescription(StkAppService.TEXT_DEFAULT_ICON);
- imageView.setImageResource(com.android.internal.R.drawable.stat_notify_sim_toolkit);
+ imageView.setImageResource(R.drawable.ic_dialog_sim);
} else {
imageView.setContentDescription(StkAppService.TEXT_ICON_FROM_COMMAND + ": "
+ mTextMsg.text);