Jellybean

Android.mk

@@ -29,6 +29,8 @@ LOCAL_SRC_FILES += \
 LOCAL_PACKAGE_NAME := Phone
 LOCAL_CERTIFICATE := platform
 
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
 include $(BUILD_PACKAGE)
 
 # Build the test package

AndroidManifest.xml

@@ -42,7 +42,9 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
     <uses-permission android:name="android.permission.ADD_SYSTEM_SERVICE" />
@@ -58,6 +60,7 @@
     <uses-permission android:name="android.permission.WRITE_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS_NO_CONFIRMATION" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.SET_TIME_ZONE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -79,6 +82,7 @@
     <uses-permission android:name="android.permission.PERFORM_CDMA_PROVISIONING" />
     <uses-permission android:name="android.permission.USE_SIP" />
     <uses-permission android:name="android.permission.REBOOT" />
+    <uses-permission android:name="android.permission.UPDATE_LOCK" />
     <uses-permission android:name="com.android.smspush.WAPPUSH_MANAGER_BIND" />
 
     <!-- This tells the activity manager to not delay any of our activity
@@ -90,11 +94,19 @@
                  android:persistent="true"
                  android:label="@string/phoneAppLabel"
                  android:icon="@drawable/ic_launcher_phone">
-            <provider android:name="IccProvider"
-                      android:authorities="icc"
-                      android:multiprocess="true"
-                      android:readPermission="android.permission.READ_CONTACTS"
-                      android:writePermission="android.permission.WRITE_CONTACTS" />
+
+        <provider android:name="IccProvider"
+                  android:authorities="icc"
+                  android:multiprocess="true"
+                  android:readPermission="android.permission.READ_CONTACTS"
+                  android:writePermission="android.permission.WRITE_CONTACTS" />
+
+        <!-- Workaround for non saved phone number -->
+        <receiver android:name=".MyPhoneNumber">
+            <intent-filter>
+                <action android:name="android.intent.action.SIM_STATE_CHANGED" />
+            </intent-filter>
+        </receiver>
 
         <!-- Dialer UI that only allows emergency calls -->
         <activity android:name="EmergencyDialer"
@@ -117,6 +129,7 @@
         <activity android:name="SimContacts"
             android:label="@string/simContacts_title"
             android:theme="@style/SimImportTheme"
+            android:screenOrientation="portrait"
             android:icon="@mipmap/ic_launcher_contacts">
 
             <intent-filter>
@@ -135,8 +148,9 @@
         </activity>
 
         <activity android:name="OutgoingCallBroadcaster"
-                android:theme="@android:style/Theme.NoDisplay"
+                android:theme="@style/OutgoingCallBroadcasterTheme"
                 android:permission="android.permission.CALL_PHONE"
+                android:screenOrientation="portrait"
                 android:configChanges="orientation|screenSize|keyboardHidden">
             <!-- CALL action intent filters, for the various ways
                  of initiating an outgoing call. -->
@@ -253,9 +267,9 @@
 
         <!-- "Mobile network settings" screen, used on both
              non-voice-capable tablets and regular phone devices. -->
-        <activity android:name="Settings"
-                android:label="@string/settings_label"
-                android:theme="@style/Theme.Settings">
+        <activity android:name="MobileNetworkSettings"
+            android:label="@string/settings_label"
+            android:theme="@style/Theme.Settings">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
@@ -264,6 +278,9 @@
             </intent-filter>
         </activity>
 
+        <activity-alias android:name="Settings"
+            android:targetActivity="MobileNetworkSettings" />
+
         <!-- networks setting -->
         <!-- service to handle network query requests sent to RIL -->
         <service android:name="NetworkQueryService" />
@@ -394,7 +411,7 @@
             </intent-filter>
         </activity>
 
-        <!-- Data usage and throttling setting -->
+        <!-- Data usage and throttling setting for ThrottleService in framework. -->
         <activity android:name="DataUsage"
                 android:label="@string/throttle_data_usage"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge">
@@ -443,6 +460,9 @@
         <service android:name="EmergencyCallbackModeService">
         </service>
 
+        <!-- service to dump telephony information -->
+        <service android:name="TelephonyDebugService" />
+
         <activity android:name="EmergencyCallbackModeExitDialog"
             android:excludeFromRecents="true"
             android:label="@string/ecm_exit_dialog"
@@ -481,10 +501,18 @@
                 android:uiOptions="splitActionBarWhenNarrow">
         </activity>
         <activity android:name=".SipCallOptionHandler"
-                android:theme="@android:style/Theme.Holo.NoActionBar"
+                android:theme="@style/SipCallOptionHandlerTheme"
+                android:screenOrientation="portrait"
                 android:configChanges="orientation|screenSize|keyboardHidden">
         </activity>
 
+        <receiver android:name="com.android.phone.PhoneToggler" android:permission="com.android.phone.CHANGE_NETWORK_MODE">
+            <intent-filter>
+                <action android:name="com.android.internal.telephony.REQUEST_NETWORK_MODE" />
+                <action android:name="com.android.internal.telephony.MODIFY_NETWORK_MODE" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name="RespondViaSmsManager$Settings"
                 android:label="@string/respond_via_sms_setting_title"
                 android:configChanges="orientation|screenSize|keyboardHidden"
@@ -494,5 +522,25 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name="CallerInfoCacheUpdateReceiver">
+            <intent-filter>
+                <action android:name="com.android.phone.UPDATE_CALLER_INFO_CACHE" />
+            </intent-filter>
+        </receiver>
+
+        <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
+        <receiver android:name="PhoneApp$NotificationBroadcastReceiver" exported="false">
+            <intent-filter>
+                <action android:name="com.android.phone.ACTION_HANG_UP_ONGOING_CALL" />
+                <action android:name="com.android.phone.ACTION_CALL_BACK_FROM_NOTIFICATION" />
+                <action android:name="com.android.phone.ACTION_SEND_SMS_FROM_NOTIFICATION" />
+            </intent-filter>
+        </receiver>
+
     </application>
+    <permission android:name="com.android.phone.CHANGE_NETWORK_MODE"
+        android:label="@string/perm_change_mobile_network"
+        android:description="@string/perm_change_mobile_network_desc"
+        android:permissionGroup="android.permission-group.COST_MONEY"
+        android:protectionLevel="dangerous" />
 </manifest>

res/drawable/dial_num_1_no_vm.xml → lint.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,8 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_1_no_vm_wht" />
-</selector>
+<!-- To suppress lint warnings -->
+<lint>
+    <!-- Phone app is not unbundled intentionally. -->
+    <issue id="UsesSdk" severity="ignore" />
+    <issue id="PrivateResource" severity="ignore" />
+</lint>

proguard.flags

@@ -0,0 +1,6 @@
+# Keep names that are used only by animation framework.
+-keepclasseswithmembers class com.android.phone.AnimationUtils$CrossFadeDrawable {
+  *** setCrossFadeAlpha(...);
+}
+
+-verbose

res/anim/activity_close_enter.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
+    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
+            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+            android:duration="300"/>
+</set>

res/anim/activity_close_exit.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shareInterpolator="false" android:zAdjustment="top">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+            android:interpolator="@*android:interpolator/decelerate_cubic"
+            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+            android:duration="300"/>
+    <scale android:fromXScale="1.0" android:toXScale=".8"
+            android:fromYScale="1.0" android:toYScale=".8"
+            android:pivotX="50%p" android:pivotY="50%p"
+            android:interpolator="@*android:interpolator/decelerate_cubic"
+            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+            android:duration="300"/>
+</set>

res/drawable/btn_call.xml

@@ -17,8 +17,7 @@
 <!-- Background resource for call button in the various dialpads.
      Almost a copy from framework's item_background_holo_dark.xml, but has different pressed effect
   -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
 

res/drawable/btn_compound_audio.xml

@@ -80,12 +80,18 @@
                 android:gravity="center" />
     </item>
 
-    <!-- Speakerphone is active -->
-    <item android:id="@+id/speakerphoneItem">
+    <!-- Speakerphone icon showing 'speaker on' state -->
+    <item android:id="@+id/speakerphoneOnItem">
         <bitmap android:src="@drawable/ic_sound_speakerphone_holo_dark"
                 android:gravity="center" />
     </item>
 
+    <!-- Speakerphone icon showing 'speaker off' state -->
+    <item android:id="@+id/speakerphoneOffItem">
+        <bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
+                android:gravity="center" />
+    </item>
+
     <!-- Generic "audio mode" icon.  Looks almost identical to
          ic_sound_speakerphone_holo_dark.png -->
     <!-- TODO: is this actually needed? -->
@@ -96,13 +102,4 @@
         </item>
     -->
 
-    <!-- Speakerphone with no audio waves coming out -->
-    <!-- TODO: is this actually needed for any possible state of the UI? -->
-    <!--
-        <item android:id="@+id/soundOffItem">
-            <bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
-                    android:gravity="center" />
-        </item>
-    -->
-
 </layer-list>

res/drawable/dial_num_2.xml → res/drawable/clickable_dim_effect.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,8 +14,11 @@
      limitations under the License.
 -->
 
+<!-- Background drawable used with dim effect for secondary photo. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_2_wht" />
-</selector>
 
+    <item android:state_pressed="true" android:state_enabled="true"
+          android:drawable="@drawable/list_pressed_holo_dark" />
+    <item android:drawable="@color/on_hold_dim_effect" />
+
+</selector>