diff options
| author | Chiao Cheng <chiaocheng@google.com> | 2012-11-09 15:57:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-09 15:57:09 -0800 |
| commit | adbc60cde3b6037d2f99b4730f79d12aa5d28668 (patch) | |
| tree | 606908dac6d082f12161aac94ed1b7483555f3b2 | |
| parent | e2ff8fa4ad0d1c1bba9d42a7f8669b36ceebfbfe (diff) | |
| parent | 437afcc9ed49ed0afb25eb9f121c16abca0e353c (diff) | |
Merge "Moving phone icon into Dialer app."
| -rw-r--r-- | AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | res/mipmap-hdpi/ic_launcher_phone.png | bin | 0 -> 7524 bytes | |||
| -rw-r--r-- | res/mipmap-mdpi/ic_launcher_phone.png | bin | 0 -> 4350 bytes | |||
| -rw-r--r-- | res/mipmap-xhdpi/ic_launcher_phone.png | bin | 0 -> 11180 bytes | |||
| -rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_phone.png | bin | 0 -> 17308 bytes |
5 files changed, 2 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7c39ee5db..502184c63 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -51,10 +51,8 @@ <application android:label="@string/applicationLabel" - android:icon="@mipmap/ic_launcher_contacts" - android:taskAffinity="android.task.contacts" - android:hardwareAccelerated="true" - > + android:icon="@mipmap/ic_launcher_phone" + android:hardwareAccelerated="true"> <!-- The entrance point for Phone UI. stateAlwaysHidden is set to suppress keyboard show up on @@ -68,7 +66,6 @@ android:icon="@mipmap/ic_launcher_phone" android:screenOrientation="nosensor" android:enabled="@*android:bool/config_voice_capable" - android:taskAffinity="android.task.contacts.phone" android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"> <intent-filter> <action android:name="android.intent.action.DIAL" /> @@ -130,7 +127,6 @@ android:theme="@style/CallDetailActivityTheme" android:screenOrientation="portrait" android:icon="@mipmap/ic_launcher_phone" - android:taskAffinity="android.task.contacts.phone" > <intent-filter> <action android:name="android.intent.action.VIEW"/> diff --git a/res/mipmap-hdpi/ic_launcher_phone.png b/res/mipmap-hdpi/ic_launcher_phone.png Binary files differnew file mode 100644 index 000000000..5a3dff1f3 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_phone.png diff --git a/res/mipmap-mdpi/ic_launcher_phone.png b/res/mipmap-mdpi/ic_launcher_phone.png Binary files differnew file mode 100644 index 000000000..9ea0d8c8b --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_phone.png diff --git a/res/mipmap-xhdpi/ic_launcher_phone.png b/res/mipmap-xhdpi/ic_launcher_phone.png Binary files differnew file mode 100644 index 000000000..e97836cdf --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_phone.png diff --git a/res/mipmap-xxhdpi/ic_launcher_phone.png b/res/mipmap-xxhdpi/ic_launcher_phone.png Binary files differnew file mode 100644 index 000000000..1594e4ec3 --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher_phone.png |
