8 years agoStop using LinearLayout outside "end call" button
Daisuke Miyakawa [Tue, 28 Feb 2012 22:50:50 +0000]
Stop using LinearLayout outside "end call" button

Do exactly samething with a single drawable.

Bug: 1271870
Bug: 6005703
Change-Id: I9d039eb785bff94c46908aa58e05c99eb717f4ee

8 years agoMerge "Remove InCallContactPhoto.java"
Daisuke Miyakawa [Tue, 28 Feb 2012 21:41:08 +0000]
Merge "Remove InCallContactPhoto.java"

8 years agoMerge "Comment out widgets around social update"
Daisuke Miyakawa [Tue, 28 Feb 2012 21:36:58 +0000]
Merge "Comment out widgets around social update"

8 years agoRemove InCallContactPhoto.java
Daisuke Miyakawa [Tue, 28 Feb 2012 20:42:51 +0000]
Remove InCallContactPhoto.java

We won't rely on inset photos anymore.

Bug: 1271870
Bug: 6005703
Change-Id: I84d5457e939249e05df080a572c33ef7a5e71c17

8 years agoComment out widgets around social update
Daisuke Miyakawa [Tue, 28 Feb 2012 20:37:12 +0000]
Comment out widgets around social update

It isn't used right now.

Bug: 1271870
Bug: 6005703
Change-Id: I7305059dd0b3914f2b08ad21ff203c7d84fdb5f0

8 years agoStop inflating DTMF dialpad when not needed
Daisuke Miyakawa [Tue, 28 Feb 2012 18:36:50 +0000]
Stop inflating DTMF dialpad when not needed

This will suppress inflating ~10 views in usual cases and reduce
~500KB memory usage for usual cases (without dialpad) on soju.

- Make DTMFTwelveKeyDialer accepts ViewStub
- Still keep the existing constructor for OTA

TESTED:
- make a phane call
- receive a phone call
- open/hide the dialpad during phone calls
- go through OTA screen

Bug: 1271870
Bug: 6005703
Change-Id: I96ad8ca39c9e5bbdbaa945716cdc3dc9f0335d73

8 years agoMerge "Remove a bunch of unnecessary resources."
Daisuke Miyakawa [Tue, 28 Feb 2012 17:59:03 +0000]
Merge "Remove a bunch of unnecessary resources."

8 years agoPrevent incoming-call widget from hiding itself.
Daisuke Miyakawa [Mon, 27 Feb 2012 22:08:14 +0000]
Prevent incoming-call widget from hiding itself.

Bug: 5810703
Change-Id: I6f50baa5cad4913ddd30146070f8af74f6733455

8 years agoam 50949ac5: (-s ours) am 3e86f891: Import translations. DO NOT MERGE
Eric Fischer [Mon, 27 Feb 2012 21:53:21 +0000]
am 50949ac5: (-s ours) am 3e86f891: Import translations. DO NOT MERGE

* commit '50949ac52d2e4a204591d0c752184468cd314a7f':
  Import translations. DO NOT MERGE

8 years agoam 3e86f891: Import translations. DO NOT MERGE
Eric Fischer [Mon, 27 Feb 2012 21:51:53 +0000]
am 3e86f891: Import translations. DO NOT MERGE

* commit '3e86f891c84f7b2b62e3b99e44fdb88499d02c1e':
  Import translations. DO NOT MERGE

8 years agoRemove unnecessary View objects from in-call screen
Daisuke Miyakawa [Fri, 24 Feb 2012 22:18:25 +0000]
Remove unnecessary View objects from in-call screen

- Remove an apparently redundant RelativeLayout.
- Make CallCard itself a LinearLayout, instead of making it
  FrameLayout containing one LinearLayout.
- Make similar hack to InCallTocuhUi. This time instead of just
  using RelativeLayout it holds, we use FrameLayout because it can
  do same functionality with less layouting cost.

TESTED:
- make a phone call
- receive a phone call
- do multiple calls at once (with GSM, CDMA)
- try a conference call

Bug: 1271870
Change-Id: I71b66dbdbcc70be0b4dfbd3d3f0cf6d122c85847

8 years agoMerge "Fix misc lint warnings."
Daisuke Miyakawa [Mon, 27 Feb 2012 21:44:55 +0000]
Merge "Fix misc lint warnings."

8 years agoMerge "Sort out OutgoingCallBroadcaster, again."
Daisuke Miyakawa [Mon, 27 Feb 2012 21:31:07 +0000]
Merge "Sort out OutgoingCallBroadcaster, again."

8 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 27 Feb 2012 21:28:36 +0000]
Import translations. DO NOT MERGE

Change-Id: I102148c876466ac834e076c9acf75b63c38b385c

8 years agoMerge "Introduce fade-in animation for contact photo."
Daisuke Miyakawa [Mon, 27 Feb 2012 21:27:07 +0000]
Merge "Introduce fade-in animation for contact photo."

8 years agoIntroduce fade-in animation for contact photo.
Daisuke Miyakawa [Tue, 21 Feb 2012 23:23:53 +0000]
Introduce fade-in animation for contact photo.

TESTED:
- make a phone call with a contact which has a photo
- make a phone call with a contact which doesn't have a photo
- make multiple phone calls
- insert arbitrary delay into ContactAsyncHelper and emulate
  slow database case. Try the sequence above

Bug: 5236130
Change-Id: Ie3499e06b4f298689adbe835991f7132d45a4881

8 years agoMerge "Make provider info all capitalized."
Daisuke Miyakawa [Mon, 27 Feb 2012 19:24:18 +0000]
Merge "Make provider info all capitalized."

8 years agoMake provider info all capitalized.
Daisuke Miyakawa [Mon, 27 Feb 2012 19:13:22 +0000]
Make provider info all capitalized.

Bug: 6021709
Change-Id: Ia8c2f5106caf057002aad58c8198fd16f050c631

8 years agoMerge "Add verbose logging for button state"
Daisuke Miyakawa [Mon, 27 Feb 2012 16:24:54 +0000]
Merge "Add verbose logging for button state"

8 years agoMerge "Add verbose logging for IncomingCallWidget"
Daisuke Miyakawa [Mon, 27 Feb 2012 16:10:23 +0000]
Merge "Add verbose logging for IncomingCallWidget"

8 years agoam 931e1ec4: (-s ours) am 14cac731: Import translations. DO NOT MERGE
Eric Fischer [Mon, 27 Feb 2012 15:51:12 +0000]
am 931e1ec4: (-s ours) am 14cac731: Import translations. DO NOT MERGE

* commit '931e1ec4ce07a870275ae8dc43dcb318bf40bd3c':
  Import translations. DO NOT MERGE

8 years agoRemove a bunch of unnecessary resources.
Daisuke Miyakawa [Mon, 27 Feb 2012 05:19:58 +0000]
Remove a bunch of unnecessary resources.

Change-Id: I044c9d1e764d8b1b0cdde79d8d568f6a20884f25

8 years agoSort out OutgoingCallBroadcaster, again.
Daisuke Miyakawa [Fri, 24 Feb 2012 17:25:34 +0000]
Sort out OutgoingCallBroadcaster, again.

1. Remove Runnable classes and just cling to original straightfoward
   implementation before I7bff3362cfcd31.
The work which AsyncTask does right now is found to be not a bottle-neck
at all. Creating AsyncTask and Runnable would just cause additional
overhead.

2. Use theme's window background instead of layout's background for
   rendering black.

3. Use FrameLayout instead of RelativeLayout for the Activity.

Bug: 6059788
Change-Id: Idb367c691d20f87ed2eb18bdb887220782fa8f97

8 years agoam 14cac731: Import translations. DO NOT MERGE
Eric Fischer [Sun, 26 Feb 2012 03:33:18 +0000]
am 14cac731: Import translations. DO NOT MERGE

* commit '14cac731c2b64376edd40dc420b9b68669d325da':
  Import translations. DO NOT MERGE

8 years agoAdd verbose logging for button state
Daisuke Miyakawa [Sat, 25 Feb 2012 22:50:04 +0000]
Add verbose logging for button state

This will enable us to track issues like bug 6028536 more easily

Change-Id: I9d03f504dc172f03d2d9318149d7a59601de6b2d

8 years agoAdd verbose logging for IncomingCallWidget
Daisuke Miyakawa [Sat, 25 Feb 2012 04:14:44 +0000]
Add verbose logging for IncomingCallWidget

Bug: 5313580
Bug: 5810703
Change-Id: I8f98051b8d2d85c13c3a8e87039c5bf9c0492867

8 years agoMerge "Use the framework rather than the RIL constants"
Robert Greenwalt [Fri, 24 Feb 2012 23:01:06 +0000]
Merge "Use the framework rather than the RIL constants"

8 years agoFix misc lint warnings.
Daisuke Miyakawa [Fri, 24 Feb 2012 04:26:46 +0000]
Fix misc lint warnings.

- Fix MergeRootFrame warnings
- Fix ExportedService warnings

Change-Id: I89cd2ad6b383814c8377c246d402f9dfd5b5d33f

8 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 24 Feb 2012 19:31:08 +0000]
Import translations. DO NOT MERGE

Change-Id: Icdce0f3365ffe5edad8652b340c4003db1ea9664

8 years agoRemove unnecessary xmls
Daisuke Miyakawa [Fri, 24 Feb 2012 03:56:49 +0000]
Remove unnecessary xmls

This is along with Iec867d2562d709db91f54c47e045536b62fc17d2

Change-Id: I0e651838fb10a0a8f3f16dcf2882f30efb51ee1a

8 years agoam a58096eb: (-s ours) am fd3a7895: Import translations. DO NOT MERGE
Eric Fischer [Thu, 23 Feb 2012 20:26:25 +0000]
am a58096eb: (-s ours) am fd3a7895: Import translations. DO NOT MERGE

* commit 'a58096ebe3790adfd3f54b293f5c2661cdba5bd6':
  Import translations. DO NOT MERGE

8 years agoam fd3a7895: Import translations. DO NOT MERGE
Eric Fischer [Thu, 23 Feb 2012 20:16:57 +0000]
am fd3a7895: Import translations. DO NOT MERGE

* commit 'fd3a7895467466c44f4c640eb98d37e45620b07e':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 23 Feb 2012 20:12:38 +0000]
Import translations. DO NOT MERGE

Change-Id: Ibb4b4373a731853a87b4ebb635705edcc5950286

8 years agoam f262f535: am a05fad3b: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 23 Feb 2012 19:20:13 +0000]
am f262f535: am a05fad3b: Reconcile with ics-mr1-release

* commit 'f262f535b61c6c0bc0b076a83a832203bfe77420':

8 years agoam 9d39ffbf: am 1746e3e6: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 23 Feb 2012 19:19:55 +0000]
am 9d39ffbf: am 1746e3e6: Reconcile with ics-mr1-release

* commit '9d39ffbf48c182b960659d96f332f077fbc933e5':

8 years agoam 0c6053fb: (-s ours) am fa6424f1: Import translations. DO NOT MERGE
Eric Fischer [Thu, 23 Feb 2012 16:34:59 +0000]
am 0c6053fb: (-s ours) am fa6424f1: Import translations. DO NOT MERGE

* commit '0c6053fb182f874a569dfd91eda37d9aef7cbd5d':
  Import translations. DO NOT MERGE

8 years agoam 4d5d1543: (-s ours) am 18febd8b: Merge "Import translations. DO NOT MERGE" into...
Eric Fischer [Thu, 23 Feb 2012 15:29:51 +0000]
am 4d5d1543: (-s ours) am 18febd8b: Merge "Import translations. DO NOT MERGE" into ics-scoop

* commit '4d5d15433bd320cb485b70d9b6791997f89fee3d':
  Import translations. DO NOT MERGE

8 years agoam 51d1c41c: (-s ours) am af99f94d: am cf391e1e: Import translations. DO NOT MERGE
Eric Fischer [Thu, 23 Feb 2012 15:29:51 +0000]
am 51d1c41c: (-s ours) am af99f94d: am cf391e1e: Import translations. DO NOT MERGE

* commit '51d1c41c7d701437bc85d6c025e031fa2c67c592':

8 years agoam 5803440b: (-s ours) am 9a371d09: am cf391e1e: Import translations. DO NOT MERGE
Eric Fischer [Thu, 23 Feb 2012 15:29:50 +0000]
am 5803440b: (-s ours) am 9a371d09: am cf391e1e: Import translations. DO NOT MERGE

* commit '5803440bcde7d894aa06a641af33f0cd850aceae':
  Import translations. DO NOT MERGE

8 years agoam 1b5a22d6: am 28d1aa1d: am 4bf466a6: Setup a flag to detect when the screen is...
Mindy Pereira [Thu, 23 Feb 2012 15:29:31 +0000]
am 1b5a22d6: am 28d1aa1d: am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '1b5a22d67a8164839b606126f23f3f67d33c9bc8':

8 years agoam 0a717aa6: am 08916cba: am 4bf466a6: Setup a flag to detect when the screen is...
Mindy Pereira [Thu, 23 Feb 2012 15:29:30 +0000]
am 0a717aa6: am 08916cba: am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '0a717aa6d161a65a3ad12828791f059ed6671fe2':
  Setup a flag to detect when the screen is on and we are in call mode.

8 years agoam b127ff0a: am 0df37f18: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 23 Feb 2012 15:29:19 +0000]
am b127ff0a: am 0df37f18: Reconcile with ics-mr1-release

* commit 'b127ff0a97513cace3571d8cc77b08e58e22b01f':

8 years agoam 9a64e962: am 7babeb58: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 23 Feb 2012 15:29:00 +0000]
am 9a64e962: am 7babeb58: Reconcile with ics-mr1-release

* commit '9a64e962d524775166b62d459a161bd68d6affd9':

8 years agoam 7e6ce107: am 5959c6f7: am fcdab673: Merge "Fix in-call notification icon flicker...
David Brown [Thu, 23 Feb 2012 15:28:49 +0000]
am 7e6ce107: am 5959c6f7: am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit '7e6ce107ec9e86b34d46a6a1c1d10aa8948d2509':

8 years agoam dd628ee2: am f21e8f25: am fcdab673: Merge "Fix in-call notification icon flicker...
David Brown [Thu, 23 Feb 2012 15:28:48 +0000]
am dd628ee2: am f21e8f25: am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit 'dd628ee20ce315bdfcd5f2b8b5ffc6dff5f67dbb':
  Fix in-call notification icon flicker when screen goes on/off

8 years agoMerge "Stop updating the whole screen on onPause()"
Daisuke Miyakawa [Thu, 23 Feb 2012 02:37:36 +0000]
Merge "Stop updating the whole screen on onPause()"

8 years agoStop updating the whole screen on onPause()
Daisuke Miyakawa [Thu, 23 Feb 2012 01:15:50 +0000]
Stop updating the whole screen on onPause()

Fixing the issue 5967067: Avatar picture disappears too early on
hang-up.

On hang-up, Phone app first receives IDLE state and exits the screen.
The call state is IDLE on onPause() in that case, which will show brief
black screen reported in the issue.

Because we always refresh the screen on onResume(), we don't need to
refresh the whole screen on onPause().

TESTED:
- make a phone call, and hang it up
- make a phone call, and let the receiver hang up the call
- make a phone call, and bail out the screen. Then enter the in-call
  UI again. Try it during a conference call and manage-conference
  screen.

Bug: 5967067
Change-Id: Id354c1096a4ac30c4d398d3d169d2794060349d7

8 years agoCopy two settings from Settings package
Daisuke Miyakawa [Wed, 22 Feb 2012 22:06:26 +0000]
Copy two settings from Settings package

- "Vibrate when ringing" (this will be removed from general Settings)
- "Dial pad touch tones" (this will remain in general Settings)

TESTED:
- turn on/off "Vibrate when ringing" and see if the device reflects the
  change.
- turn on/off "Dial pad touch tones" and see if the device reflects the
  change.
- check if two "Dial pad touch tones" settings (one in Phone, another in
  general Settings) are in sync.

Bug: 5129899
Bug: 6029673
Change-Id: Ifb19b53b850ee8a4c15891190bbc0abe822a9fe2

8 years agoMove ContactsAsyncHelper from framework to Phone package
Daisuke Miyakawa [Wed, 22 Feb 2012 01:16:55 +0000]
Move ContactsAsyncHelper from framework to Phone package

- Copy the whole file from framework to this package
- Modify the code so that it won't touch View at all

This change is a preparation for the issue 5236130: Brief glitch of
"unknown" contact photo before real photo appears. Previously both
CallCard and ContactsAsyncHelper have touched View's visibilty, which
is found to be inconvenient for animation handling.

For simplicity, this change itself is expected to cause no UI change.
Actual UI difference (for bug 5236130) should occur later.

TESTED (expecting no difference):
- make a phone call with GSM (which will still show the problem
  mentioned in the issue 5236130)
-- make another phone call during the call
-- merge those two calls, and start conference call
- make a phone call with CDMA
-- make another phone call during the call
-- merge those two calls, and try swap button.

Bug: 5236130
Change-Id: Ide31e9862a03ab82c0c5818fee0b03ced1286991

8 years agoam a05fad3b: Reconcile with ics-mr1-release
The Android Open Source Project [Tue, 21 Feb 2012 23:17:23 +0000]
am a05fad3b: Reconcile with ics-mr1-release

* commit 'a05fad3b056584fe6f481582a28fa35dac2cb0b3':

8 years agoReconcile with ics-mr1-release
The Android Open Source Project [Tue, 21 Feb 2012 23:14:02 +0000]
Reconcile with ics-mr1-release

Change-Id: Ieccda483626441e69e42c3fa97103c797947ca45

8 years agoam 1746e3e6: Reconcile with ics-mr1-release
The Android Open Source Project [Tue, 21 Feb 2012 23:10:30 +0000]
am 1746e3e6: Reconcile with ics-mr1-release

* commit '1746e3e6e71057bb0a9b1ce78a6c4d4aee86594f':

8 years agoReconcile with ics-mr1-release
The Android Open Source Project [Tue, 21 Feb 2012 23:07:15 +0000]
Reconcile with ics-mr1-release

Change-Id: Ib3be35645f4ba2ea01c9b536d75d58f4ceb2abc9

8 years agoam fa6424f1: Import translations. DO NOT MERGE
Eric Fischer [Tue, 21 Feb 2012 20:15:05 +0000]
am fa6424f1: Import translations. DO NOT MERGE

* commit 'fa6424f19123932ef3c42dbaef907bfda2632875':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 21 Feb 2012 20:10:06 +0000]
Import translations. DO NOT MERGE

Change-Id: I164b8d66d3fe91b6894cfeaa6303f2f19de02c43

8 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 18 Feb 2012 00:39:45 +0000]
merge in ics-mr1-release history after reset to ics-mr1

8 years agoUse the framework rather than the RIL constants
Robert Greenwalt [Fri, 17 Feb 2012 23:22:21 +0000]
Use the framework rather than the RIL constants

bug:5717664
Change-Id: I5dcb17b66f72d31407982bbb28633f832ec98787

8 years agoam 18febd8b: Merge "Import translations. DO NOT MERGE" into ics-scoop
Eric Fischer [Fri, 17 Feb 2012 22:54:10 +0000]
am 18febd8b: Merge "Import translations. DO NOT MERGE" into ics-scoop

* commit '18febd8b9b7abcc7138711477feb9c723bb5b1c6':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into ics-scoop
Eric Fischer [Fri, 17 Feb 2012 22:52:22 +0000]
Merge "Import translations. DO NOT MERGE" into ics-scoop

8 years agoam af99f94d: am cf391e1e: Import translations. DO NOT MERGE
Eric Fischer [Fri, 17 Feb 2012 22:34:01 +0000]
am af99f94d: am cf391e1e: Import translations. DO NOT MERGE

* commit 'af99f94d637959f25b4180dde479eb3b647edd51':

8 years agoam 9a371d09: am cf391e1e: Import translations. DO NOT MERGE
Eric Fischer [Fri, 17 Feb 2012 22:33:01 +0000]
am 9a371d09: am cf391e1e: Import translations. DO NOT MERGE

* commit '9a371d094ad93837680004be535fde9db327f7e4':
  Import translations. DO NOT MERGE

8 years agoam cf391e1e: Import translations. DO NOT MERGE
Eric Fischer [Fri, 17 Feb 2012 22:32:07 +0000]
am cf391e1e: Import translations. DO NOT MERGE

* commit 'cf391e1e1884b76101d2912e71b384bab16f5cb2':
  Import translations. DO NOT MERGE

8 years agoam cf391e1e: Import translations. DO NOT MERGE
Eric Fischer [Fri, 17 Feb 2012 22:31:44 +0000]
am cf391e1e: Import translations. DO NOT MERGE

* commit 'cf391e1e1884b76101d2912e71b384bab16f5cb2':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 17 Feb 2012 22:02:20 +0000]
Import translations. DO NOT MERGE

Change-Id: I75feac7ec47d14de42787e5d47dd274a43b3b266

8 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 17 Feb 2012 20:57:58 +0000]
Import translations. DO NOT MERGE

Change-Id: I5753adbd0904a4c9ac3d8780421ef773fd67909a

8 years agoam 28d1aa1d: am 4bf466a6: Setup a flag to detect when the screen is on and we are...
Mindy Pereira [Fri, 17 Feb 2012 20:43:33 +0000]
am 28d1aa1d: am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '28d1aa1d24235ff7d1ee84168f6ca37df0782d54':

8 years agoam 08916cba: am 4bf466a6: Setup a flag to detect when the screen is on and we are...
Mindy Pereira [Fri, 17 Feb 2012 20:43:06 +0000]
am 08916cba: am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '08916cbadbcd9aa3e58badd1bab71e0128cf3f79':
  Setup a flag to detect when the screen is on and we are in call mode.

8 years agoam 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.
Mindy Pereira [Fri, 17 Feb 2012 20:41:23 +0000]
am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '4bf466a6d117a6fc4ddfd480f7db7606a29cb4ff':
  Setup a flag to detect when the screen is on and we are in call mode.

8 years agoam 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.
Mindy Pereira [Fri, 17 Feb 2012 20:41:18 +0000]
am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '4bf466a6d117a6fc4ddfd480f7db7606a29cb4ff':
  Setup a flag to detect when the screen is on and we are in call mode.

8 years agoSetup a flag to detect when the screen is on and we are in call mode.
Mindy Pereira [Fri, 17 Feb 2012 20:27:15 +0000]
Setup a flag to detect when the screen is on and we are in call mode.

Fixes b/6029570 Proximity turns screen on and off repeatedly for no reason, when device is flat

Change-Id: Ie727dd779bb957cd6da948dbe1584a4382d9935a

8 years agoam 0df37f18: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 17 Feb 2012 17:06:02 +0000]
am 0df37f18: Reconcile with ics-mr1-release

* commit '0df37f189ce4f13ece118db928a4feb25f3eb9e2':

8 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 17 Feb 2012 17:03:41 +0000]
Reconcile with ics-mr1-release

Change-Id: I1e10793e845780b0093bfe5cdb75a06a6503fa4b

8 years agoam 7babeb58: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 17 Feb 2012 16:11:37 +0000]
am 7babeb58: Reconcile with ics-mr1-release

* commit '7babeb58a22a9d2c50cfc5d7dfd3d3943c6f608c':

8 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 17 Feb 2012 16:10:06 +0000]
Reconcile with ics-mr1-release

Change-Id: Ia9594222cbf31d6edc1a2c20b3978d7f780f9205

8 years agoam 5959c6f7: am fcdab673: Merge "Fix in-call notification icon flicker when screen...
David Brown [Fri, 17 Feb 2012 00:44:38 +0000]
am 5959c6f7: am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit '5959c6f76f827c07cd44a0c85036e84026d84972':

8 years agoam f21e8f25: am fcdab673: Merge "Fix in-call notification icon flicker when screen...
David Brown [Fri, 17 Feb 2012 00:44:35 +0000]
am f21e8f25: am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit 'f21e8f250fe60f0203db40a32600af601edae0b8':
  Fix in-call notification icon flicker when screen goes on/off

8 years agoam 7f17935c: am a9848d00: am 73031492: Introduce vibration options for voicemail...
Daisuke Miyakawa [Fri, 17 Feb 2012 00:43:39 +0000]
am 7f17935c: am a9848d00: am 73031492: Introduce vibration options for voicemail notification

* commit '7f17935cab76f6cbec2b6cd2bfa32e313ee0c982':

8 years agoam fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off...
David Brown [Fri, 17 Feb 2012 00:42:41 +0000]
am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit 'fcdab67302256cbeaf950bd591b03d55e1917d85':
  Fix in-call notification icon flicker when screen goes on/off

8 years agoam fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off...
David Brown [Fri, 17 Feb 2012 00:42:23 +0000]
am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit 'fcdab67302256cbeaf950bd591b03d55e1917d85':
  Fix in-call notification icon flicker when screen goes on/off

8 years agoresolved conflicts for merge of ec85aeb5 to master
Daisuke Miyakawa [Fri, 17 Feb 2012 00:40:59 +0000]
resolved conflicts for merge of ec85aeb5 to master

Change-Id: Ic31edb98bab69421ec15050238f300f984d76405

8 years agoMerge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1
David Brown [Fri, 17 Feb 2012 00:40:18 +0000]
Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

8 years agoFix in-call notification icon flicker when screen goes on/off
David Brown [Fri, 17 Feb 2012 00:32:23 +0000]
Fix in-call notification icon flicker when screen goes on/off

We currently suppress the "in-call" status bar notification if the
InCallScreen is the foreground activity.  This helps reduce clutter in the
status bar, since it's already obvious that you're on a call.

Unfortunately, when the screen is off (like when the prox sensor is
active), the InCallScreen is technically not the foreground activity, so
we *were* enabling the status bar icon in that state.  This was causing a
brief flicker of the status bar icon any time the screen turned on during
a call (like when pulling the phone away from your face.)

The fix is simple: just suppress the notification when the screen is off.
This way the transition from "screen off" to "InCallScreen in foreground"
doesn't cause the notification to change state.

TESTED:

  - While on a call, with in-call UI visible, trigger prox sensor several
    times
    ==> no glitches; icon is never visible.

  - While on a call, bail out to Home screen, then, trigger prox sensor
    several times
    ==> no glitches; icon is steadily visible whenever the screen is on.
        (Specifically, this test shows that this CL has no effect if some
        other app is active.  That's because once you bail out of the
        in-call UI, the updateInCallNotification() method doesn't even get
        called when the screen goes on and off; it's only called for phone
        state transitions, or when the InCallScreen gets paused or
        resumed.  So the notification remains enabled the whole time.)

  - Launched an outgoing call
    ==> no glitches; icon doesn't appear at all (even as a brief flicker)
        during the transition from the dialer to the InCallScreen.

  - Incoming call
    ==> no glitches; icon is visible while ringing (which is WAI),
        disappears cleanly when you answer the call.

Bug: 6021909
Change-Id: I43625f4f69ce75c662c211dadc7292fb14641073

8 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 17 Feb 2012 00:26:53 +0000]
merge in ics-mr1-release history after reset to ics-mr1

8 years agoam a9848d00: am 73031492: Introduce vibration options for voicemail notification
Daisuke Miyakawa [Fri, 17 Feb 2012 00:08:53 +0000]
am a9848d00: am 73031492: Introduce vibration options for voicemail notification

* commit 'a9848d0087a49ef7ade4248502cca0b1eaee4c75':

8 years agoam 023bfc74: am 73031492: Introduce vibration options for voicemail notification
Daisuke Miyakawa [Fri, 17 Feb 2012 00:08:41 +0000]
am 023bfc74: am 73031492: Introduce vibration options for voicemail notification

* commit '023bfc74d965a84f3cb725ee389dfd12ffd290f0':
  Introduce vibration options for voicemail notification

8 years agoam 73031492: Introduce vibration options for voicemail notification
Daisuke Miyakawa [Fri, 17 Feb 2012 00:06:46 +0000]
am 73031492: Introduce vibration options for voicemail notification

* commit '73031492772779079308aa981ce5dc76655dc71a':
  Introduce vibration options for voicemail notification

8 years agoam 73031492: Introduce vibration options for voicemail notification
Daisuke Miyakawa [Fri, 17 Feb 2012 00:06:35 +0000]
am 73031492: Introduce vibration options for voicemail notification

* commit '73031492772779079308aa981ce5dc76655dc71a':
  Introduce vibration options for voicemail notification

8 years agoIntroduce vibration options for voicemail notification
Daisuke Miyakawa [Thu, 16 Feb 2012 21:24:21 +0000]
Introduce vibration options for voicemail notification

Bug: 6014374
Change-Id: I1e0dff2e958b804e140b2d0d1d286f3392efecd1

8 years agoam 89768ea3: am a5aa4c29: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 19:25:33 +0000]
am 89768ea3: am a5aa4c29: Reconcile with ics-mr1-release

* commit '89768ea33b0ff70e06e078857a7ac8cd94cb7d20':

8 years agoam 58dc7c59: am 220440ff: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 19:25:18 +0000]
am 58dc7c59: am 220440ff: Reconcile with ics-mr1-release

* commit '58dc7c5970f1741b64033dffed22c9e990816193':
  Correctly hide in-call panel when dialpad is shown

8 years agoam a5aa4c29: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:13:47 +0000]
am a5aa4c29: Reconcile with ics-mr1-release

* commit 'a5aa4c291a76fe12fb4e5ae250d17784bfe79dee':

8 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:11:01 +0000]
Reconcile with ics-mr1-release

Change-Id: I310f5634ca56d5b1f215ded8a7f30ec6ddb5fe2d

8 years agoam 220440ff: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:06:40 +0000]
am 220440ff: Reconcile with ics-mr1-release

* commit '220440ff92274329fee44214a44b304cc45bb3ab':
  Correctly hide in-call panel when dialpad is shown

8 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:03:00 +0000]
Reconcile with ics-mr1-release

Change-Id: I4565209efafdb453db627b9482478612aec45ae4

8 years agoMerge "Import translations."
Eric Fischer [Wed, 15 Feb 2012 21:29:28 +0000]
Merge "Import translations."

8 years agoImport translations.
Eric Fischer [Wed, 15 Feb 2012 20:33:39 +0000]
Import translations.

Change-Id: I16b8a81f609cd35846af9e97f7236959094e8834

8 years agoStrip FDN phone numbers before sending it to IccProvider
Daisuke Miyakawa [Sun, 12 Feb 2012 02:19:38 +0000]
Strip FDN phone numbers before sending it to IccProvider

There's no way to determine exactly why the insert/update failed.
PIN2 might be incorrect, or the number might be just inappropriate.
Note that some SIM may reject even spaces between digits, while
"import from contacts" menu may introduce spaces so easily.

This change tries to translate/strip inappropriate characters before
sending them to IccProvider (content://icc/fdn), and has toast
show correct description than just "your PIN2 was incorrect."
Now that the toast became too long, this change also makes toast
live longer.

Requires I49b996abe7a44f7db4301b62f667189281fc40e9

Bug: 5546664
Change-Id: Iec2b1bf9f510c3a4f6ee8419d441fb09209a8803

8 years agoVery tiny clean up.
Daisuke Miyakawa [Wed, 15 Feb 2012 17:18:57 +0000]
Very tiny clean up.

Change-Id: Ib3ec854140e760727418511266794c5a933b856b

8 years agoA bunch of clean-up
Daisuke Miyakawa [Wed, 15 Feb 2012 03:01:35 +0000]
A bunch of clean-up

Change-Id: Ie62c28b523669686df2ead9b8925efb4c46b3503

8 years agoMerge "Suppress lint warnings for untranslatable string"
Daisuke Miyakawa [Wed, 15 Feb 2012 00:57:45 +0000]
Merge "Suppress lint warnings for untranslatable string"