summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorSandeep Gutta <sangutta@codeaurora.org>2013-11-11 19:23:13 +0530
committerSandeep Gutta <sangutta@codeaurora.org>2013-11-25 14:57:09 +0530
commitd6e8ea435025aceadbf58ba78c4a2dd7fc745027 (patch)
treef33e72b81e5951dae3aa4a4679705b6892b4bed3 /res/values
parentf053a386531bb464cd95e7069f2bd0c058792941 (diff)
downloadandroid_packages_apps_InCallUI-d6e8ea435025aceadbf58ba78c4a2dd7fc745027.tar.gz
android_packages_apps_InCallUI-d6e8ea435025aceadbf58ba78c4a2dd7fc745027.tar.bz2
android_packages_apps_InCallUI-d6e8ea435025aceadbf58ba78c4a2dd7fc745027.zip
DSDA: Add InCallUI DSDA support.
-Add tab view support for DSDA -Add support to display voice calls based on the current active subscription. -Add few utilities in CallList, which required for handling voice calls across multiple subscription. Change-Id: Ib683f7c3b41ed3bb04367be1e9c331908bc46004
Diffstat (limited to 'res/values')
-rw-r--r--res/values/array.xml6
-rw-r--r--res/values/dimens.xml3
-rwxr-xr-xres/values/strings.xml5
-rw-r--r--res/values/styles.xml2
4 files changed, 15 insertions, 1 deletions
diff --git a/res/values/array.xml b/res/values/array.xml
index ba7e4cb3..50d28236 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -143,4 +143,10 @@
<item>@string/description_direction_down_right</item>
</array>
+ <array name="sim_icons">
+ <item>@drawable/ic_sim_icon_1</item>
+ <item>@drawable/ic_sim_icon_2</item>
+ <item>@null</item>
+ </array>
+
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d0b86a96..6a210d31 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -61,6 +61,9 @@
the prox sensor kick in.) -->
<dimen name="button_cluster_side_padding">20dp</dimen>
+ <!-- Dimensions for DSDA switch tab -->
+ <dimen name="dsda_sub_icon_marginTop">14dp</dimen>
+ <dimen name="dsda_sub_text_marginTop">12dp</dimen>
<!-- Dimensions for OTA Call Card -->
<dimen name="otaactivate_layout_marginTop">10dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4c06860..83850a56 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1530,4 +1530,9 @@
<!-- Label for "Manage conference call" panel [CHAR LIMIT=40] -->
<string name="manageConferenceLabel">Manage conference call</string>
+
+ <!-- Set Subscription screen: label sub 1 -->
+ <string name="sub_1">SUB 1</string>
+ <!-- Set Subscription screen: label sub 2 -->
+ <string name="sub_2">SUB 2</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 45706532..adcfc5e9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -126,7 +126,7 @@
window background instead of the default dark grey. (We don't just use
Theme.Black.NoTitleBar directly, since we want any popups or dialogs
from the InCallActivity to have the correct holo style. -->
- <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo.NoActionBar">
+ <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo">
<item name="android:windowBackground">@android:color/black</item>
<item name="*android:windowAnimationStyle">@style/InCallAnimationStyle</item>