Merge "Fix build breakage by adding color to contacts common." into lmp-mr1-dev
diff --git a/res-common/layout/default_account_checkbox.xml b/res-common/layout/default_account_checkbox.xml
index 1518076..9a1a450 100644
--- a/res-common/layout/default_account_checkbox.xml
+++ b/res-common/layout/default_account_checkbox.xml
@@ -18,21 +18,19 @@
android:id="@+id/default_account_checkbox_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
+ android:padding="4dp"
android:orientation="vertical">
- <!-- Dummy to enable right-justification of checkbox -->
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
<CheckBox
android:id="@+id/default_account_checkbox_view"
+ android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="20dip"
- android:layout_marginLeft="20dip"
+ android:paddingStart="15dip"
+ android:layout_marginLeft="13dip"
android:layout_marginBottom="20dip"
android:gravity="center"
- android:textSize="14sp"
android:textAlignment="viewStart"
- android:text="@string/set_default_account"/>
+ android:text="@string/set_default_account"
+ android:textColor="@color/dialtacts_secondary_text_color"
+ />
</LinearLayout>
\ No newline at end of file
diff --git a/res-common/layout/select_account_list_item.xml b/res-common/layout/select_account_list_item.xml
index 1999fce..39a5af0 100644
--- a/res-common/layout/select_account_list_item.xml
+++ b/res-common/layout/select_account_list_item.xml
@@ -20,7 +20,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="4dp" >
+ android:padding="8dp" >
<ImageView android:id="@+id/icon"
android:layout_width="48dp"
@@ -28,11 +28,26 @@
android:tint="@color/dialtacts_secondary_text_color"
android:scaleType="center" />
- <TextView android:id="@+id/text"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ <LinearLayout
+ android:id="@+id/text"
android:gravity="start|center_vertical"
android:layout_marginLeft="8dp"
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+ <TextView android:id="@+id/label"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@color/dialtacts_primary_text_color"
+ android:includeFontPadding="false"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <TextView android:id="@+id/number"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:includeFontPadding="false"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone" />
+ </LinearLayout>
+
</view>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 9713762..c2413b2 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -769,4 +769,6 @@
<!-- Label for the check box to toggle default sim card setting [CHAR LIMIT=35]-->
<string name="set_default_account">Always use this for calls</string>
+ <!-- Title for dialog to select Phone Account for outgoing call. [CHAR LIMIT=40] -->
+ <string name="select_phone_account_for_calls">Call with</string>
</resources>