Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jellybean #12

Open
wants to merge 1,010 commits into
base: ics
Choose a base branch
from
Open

Jellybean #12

wants to merge 1,010 commits into from

Conversation

skelliam
Copy link

@skelliam skelliam commented Jan 4, 2013

Hi Nicholas,

Whenever I try to make clean, I get errors about duplicate strings in this file -- indeed there are duplicates, can you take a look at this?

Thanks,

--Bill

(should be merged to jellybean branch actually -- WTF, it thinks I want to merge hundreds of commits when I intended just one, sorry about that -- seems no way to cancel).

jmtrivi and others added 30 commits May 17, 2012 09:56
Make PhoneApp register its media button event receiver so it
 sees media button key events first when the phone is ringing
 or when in call.

Bug 6484717

Change-Id: I415e4b2b7a1e34922eabb06bb7f0e39b82e40faf
This change add a feature to reveal the swipe to search interface
when the home key is pressed for longer than 50ms.  It progressively
reveals the interface.  It still requires a bit of tuning, but all
the basic parameters are in this CL.

Change-Id: I6ab14a5adfaab1e46908391381f746c4580fef27
Change-Id: I10c5ffb4eba58d55faa1bcae795243c58343c9ff
Change-Id: I725c5dfcb8c81c8f5c563a1b20d772d04d375c05
Phone app in showing "instant-text-response" (or respond-via-SMS)
choice during incoming call even when MMS/SMS is disabled.
This change will hide the choice when the app cannot find the
correct destination.

Bug: 6522049
Change-Id: I22f83d1973c5c7df33e590d5903ea30d664d5be3
Bug: 6570480
Change-Id: I72e7e50edd61c0dc41c9877976a1e4a63e7a514c
This will make the notification on top of others with normal
priority, with which users can use "hang-up" action during the call
even when other notifications appear.

TESTED:
- receive a phone call and get a SMS message after answering it.
  Without the flag, SMS message will be above the ongoing call, which
  makes the "hang-up" button collapsed.
  With the flag, the ongoing call notification is still on top of the
  list and because fo that the action is clickable by the user.

Bug: 6580973
Change-Id: I2ad1c66ad7b394b603c8ec0bc04a50e730ae338c
This change introduces animation tweaks for entering/exiting
InCallScreen. It looks like a "task-to-task" transition right now,
which is unexpceted.

Here are three parts of this change:
- Have styles for entering animations.
- Have optional args for the Intent exiting InCallScreen.
- Fix a visual glitch around "elapsedTime" TextView, which has existed
  but becomes more prominent with the correct animation.

A fundamental fix would be to stop using "singleInstance" launchMode for
InCallScreen, and remove a bunch of implementations relying on it, which
is very risky at this moment.

Bug: 6556973
Change-Id: Id2708ab1b1de650d45946c16a7f062bb2d3ba0ab
- Introduce the functionality
- Have appropriate drawable for it
- Make its target smaller than usual, to avoid mistouch (same behavior
  of end-call button)

TESTED:
GSM
- click the secondary photo during having two phone calls.
  -> "click" effect and the actual "swap" action should happen

- click the secondary photo during making a second phone call which is
  not answered yet
  -> "click" effect nor the "swap" action should not happen.

CDMA
- try 3 way calls and click the secondary photo.
  -> It should not initiate the "swap" action

Bug: 6598462
Change-Id: I20986ec3e33ee5f7d4015fd5d2ba961207203f02
Bug: 6603655
Change-Id: I2446692ba7f782af68fc985bb064d7a9724df730
.. during other calls.

This change slightly reverts what we've done in
I6c66901c4731299494dcb1340803c25fee42ca31. Before the change,
INCOMING_REJECTED was actually using CALL_ENDED_LONG_DELAY.

Bug: 6616432
Change-Id: I3a1f05616608a52a6013108725887df031a9822f
Change-Id: I14141f43dff67152e481c7f2fa3721b6a2692c1e
Change-Id: I66425e6921d946c9d2f59058664b1b40dffe778a
Change-Id: I66425e6921d946c9d2f59058664b1b40dffe778a
…ing.

Change-Id: Ia9f1bdf127c1758a6be49f455e557a5399e743e9
bug:6764322
Change-Id: Ieca5fc35ca57cd71bc07b5beb2319a67450f9a59
rmcc and others added 30 commits November 3, 2012 18:06
Change-Id: Ife0ebcb75110750a0dffe19d93652a2194247643
Patch Set 1:    * Add German translation for keep proximity sensor on
                * Add German Translation for lock screen if call ends with screen off

Change-Id: If11635fc6c94ddc3f2d017bce9bc8e1bb3e184e4
Added missing strings

Patchset 2: fixed according to inline comments
Patchset 3: modified string order to fit original string.xml
Patchset 4: added lte modes array missing items

Change-Id: I2db743af11c98ed41daac55a7b242772bc86477c
Change-Id: I34f20570267a22cf29dbf878a361a00ae32883b2
Conflicts:
	res/values-de/strings.xml
Change-Id: I88d6594b9ec7fbb009ed5091d253a09e988973fc
A broken sms info should never break phone app

E/AndroidRuntime( 3367): FATAL EXCEPTION: HeadsetBase Event Thread
E/AndroidRuntime( 3367): java.lang.NullPointerException
E/AndroidRuntime( 3367): 	at com.android.phone.BluetoothSMSAccess.CreatePDUResponse(BluetoothSMSAccess.java:599)
E/AndroidRuntime( 3367): 	at com.android.phone.BluetoothSMSAccess.access$1300(BluetoothSMSAccess.java:41)
E/AndroidRuntime( 3367): 	at com.android.phone.BluetoothSMSAccess$7.handleSetCommand(BluetoothSMSAccess.java:354)
E/AndroidRuntime( 3367): 	at android.bluetooth.AtParser.process(AtParser.java:350)
E/AndroidRuntime( 3367): 	at android.bluetooth.HeadsetBase.handleInput(HeadsetBase.java:133)
E/AndroidRuntime( 3367): 	at android.bluetooth.HeadsetBase$1.run(HeadsetBase.java:172)

Change-Id: I796b224a9c052da6bb5caaed045bd743dcd4c783
Conflicts:
	res/values-fr/strings.xml
Change-Id: I191df0f4a203dc0a0d8f134e1b5f9747c2b6fab8
Change-Id: I87b079820e56847acfdcf602771aab4a518a93e0
Change-Id: Ic66a8627f7afed283572c821d079d1a449d98d6d

Conflicts:

	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/PhoneUtils.java

Conflicts:

	src/com/android/phone/PhoneUtils.java
Change-Id: I1e08ef6a62e8f7e633e0f69daf1e0a999bd399f1
sometimes during disconnection, call state can change like:
ACTIVE > DISCONNECTING > ACTIVE > DISCONNECTED
prevent a new start of call recording in such case

Change-Id: Ic8756278b599fba8f14bb10966752f22650af29e
Add call record translation PT-BR
Change-Id: I53a0e2c01504d856483384c9fdb544e7f775e839
Change-Id: Iddbc7d24ce9c9baf8a0ee50181f300483b0b2efc
This broadcast can be used by voice dialing applications to stop
themselves.

Change-Id: Ic9c8b121f09ea1d6580c98e0054dd71decb15399
Conflicts:
	res/values-pt-rPT/strings.xml

Change-Id: I74e46a2088d16bc2d0947bb0a143811dc070dfe7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.