Merge "Do not show geocode for voicemail and private numbers."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 48ef0c8..12e0e3b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,6 +68,7 @@
<activity android:name=".activities.CallLogActivity"
android:label="@string/recentCallsIconLabel"
android:theme="@style/DialtactsTheme"
+ android:uiOptions="splitActionBarWhenNarrow"
>
<intent-filter>
<action android:name="com.android.phone.action.RECENT_CALLS" />
@@ -131,6 +132,7 @@
<activity android:name=".activities.DialtactsActivity"
android:label="@string/launcherDialer"
android:theme="@style/DialtactsTheme"
+ android:uiOptions="splitActionBarWhenNarrow"
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
android:icon="@mipmap/ic_launcher_phone"
@@ -185,6 +187,7 @@
<activity android:name=".activities.PeopleActivity"
android:label="@string/people"
android:theme="@style/PeopleTheme"
+ android:uiOptions="splitActionBarWhenNarrow"
android:clearTaskOnLaunch="true"
android:launchMode="singleTop"
>
@@ -365,6 +368,7 @@
<activity android:name=".activities.GroupBrowserActivity"
android:label="@string/contactsGroupsLabel"
android:theme="@style/PeopleTheme"
+ android:uiOptions="splitActionBarWhenNarrow"
android:launchMode="singleTop"
android:clearTaskOnLaunch="true">
<!-- TODO: Remove this temporary intent action name when the fragmentization
@@ -379,7 +383,8 @@
<!-- Views the details of a single group -->
<activity android:name=".activities.GroupDetailActivity"
android:label=""
- android:theme="@style/GroupDetailTheme" />
+ android:theme="@style/GroupDetailTheme"
+ android:uiOptions="splitActionBarWhenNarrow"/>
<!-- Create a new or edit an existing group -->
<activity
@@ -467,6 +472,7 @@
<activity android:name="CallDetailActivity"
android:label="@string/callDetailTitle"
android:theme="@style/CallDetailActivityTheme"
+ android:uiOptions="splitActionBarWhenNarrow"
android:screenOrientation="nosensor"
android:icon="@mipmap/ic_launcher_phone"
android:taskAffinity="android.task.contacts.phone"
@@ -498,6 +504,7 @@
<activity
android:name=".activities.ContactEditorActivity"
android:theme="@style/ContactEditorActivityTheme"
+ android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/editContactDescription">
diff --git a/res/values-sw580dp-w720dp/styles.xml b/res/values-sw580dp-w720dp/styles.xml
index 4de10b6..a6cbb9b 100644
--- a/res/values-sw580dp-w720dp/styles.xml
+++ b/res/values-sw580dp-w720dp/styles.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
- <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse.SplitActionBarWhenNarrow">
+ <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
diff --git a/res/values-sw580dp/styles.xml b/res/values-sw580dp/styles.xml
index 256683a..fb4e82b 100644
--- a/res/values-sw580dp/styles.xml
+++ b/res/values-sw580dp/styles.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
- <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse.SplitActionBarWhenNarrow">
+ <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 58374ce..c125698 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,7 @@
-->
<resources>
<style name="DialtactsTheme"
- parent="android:Theme.Holo.SplitActionBarWhenNarrow">
+ parent="android:Theme.Holo">
<item name="android:windowActionBarOverlay">true</item>
<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
<item name="android:windowContentOverlay">@null</item>
@@ -73,13 +73,13 @@
<item name="call_log_voicemail_status_text_color">#000000</item>
</style>
- <style name="ContactDetailActivityTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse">
+ <style name="ContactDetailActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
</style>
- <style name="ContactEditorActivityTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse.SplitActionBarWhenNarrow">
+ <style name="ContactEditorActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:windowContentOverlay">@null</item>
</style>
@@ -117,7 +117,7 @@
<item name="android:windowExitAnimation">@anim/dummy_animation</item>
</style>
- <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse.SplitActionBarWhenNarrow">
+ <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
@@ -156,7 +156,7 @@
</style>
<!-- TODO: Clean up this file so themes aren't copied. -->
- <style name="GroupDetailTheme" parent="@android:style/Theme.Holo.Light.SolidActionBar.Inverse.SplitActionBarWhenNarrow">
+ <style name="GroupDetailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
diff --git a/src/com/android/contacts/list/ShortcutIntentBuilder.java b/src/com/android/contacts/list/ShortcutIntentBuilder.java
index 43a6c1e..3aa0b55 100644
--- a/src/com/android/contacts/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -297,6 +297,7 @@
overlay.setBounds(dst);
overlay.draw(canvas);
+ canvas.setBitmap(null);
return icon;
}
@@ -373,6 +374,8 @@
canvas.drawBitmap(phoneIcon, src, dst, photoPaint);
}
+ canvas.setBitmap(null);
+
return icon;
}
}
diff --git a/src/com/android/contacts/widget/TransitionAnimationView.java b/src/com/android/contacts/widget/TransitionAnimationView.java
index a58a6c9..e2f8a87 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -179,6 +179,7 @@
paint);
canvas.clipRect(mClipRect);
view.draw(canvas);
+ canvas.setBitmap(null);
mPreviousStateView.setVisibility(View.VISIBLE);
mEnterAnimation.setTarget(view);