summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 15319ded: am 460abe97: Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
|\ | | | | | | | | * commit '15319ded1545dbb266273439063caf6ca23629f5': Add support for Caller Name Display
| * am 460abe97: Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
| |\ | | | | | | | | | | | | * commit '460abe97b06fd42cc37bdebb7f0ad4a7ef0e8bde': Add support for Caller Name Display
| | * Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
| | |\
| | | * Add support for Caller Name Displaykenshin2012-06-043-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied relevant parts from CdmaConnection.java to get the information as/if presented by network operator (Fido/Rogers in canada provide that information, and it get displayed if there's no match in phonebook). Although it works (the nale is displayed when the call is received), the information is not stored (not kept in the log). * Patch Set 2 : correct coding style * Patch Set 3 : promote [get]cnapName, [get]cnapNapePresentation to parent class (Connection) * Patch Set 4 : -remove ref to CDMA in get[CnapName|CnapNamePresentation] headers -remove unnecessary self ref-reference * Patch Set 5 : -add forgoten "protected" modifier to newly promoted class memebers Change-Id: I2279f75d679d5afa716d9904fc3b3e33c77948c6
* | | | am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-devCraig Mautner2012-06-121-16/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '4d6a0df37930309f8e138499785483d9dcadf7d9': Do not cancel animations when switching.
| * \ \ \ Merge "Do not cancel animations when switching." into jb-devCraig Mautner2012-06-121-16/+0
| |\ \ \ \
| | * | | | Do not cancel animations when switching.Craig Mautner2012-06-121-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was canceling ongoing animations when starting a new animation which caused the window of the first animation to restart. This looked janky. The original cancellation was put in to stop the incorrect animation being selected when quickly switching between an incoming app and the homescreen. Reversing the cancellation no longer exposes the original problem it was put in to fix. One way to duplicate what this is fixing. 1. Slow down animations to 10x. 2. Run ApiDemos/App/Alert Dialogs/List dialog 3. Tap outside the list dialog and then tap the home button. Tapping outside the list dialog causes the list dialog to animate away. Tapping the home button then causes the app to animate away. Before this fix the list dialog would revert to full size before the app animates away. With this fix the list dialog continues its original animation as the app animates away. Fixes bug 6600726. Change-Id: I29c940254808a321c3b6c2e4f4b7c78a72b47899
* | | | | | am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to ↵James Dong2012-06-122-0/+190
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libvideoeditor_jni.so" into jb-dev * commit '085c4825897bbbfa0f8564c2de45f74d7bea4029': Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
| * | | | | Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into ↵James Dong2012-06-122-0/+190
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jb-dev
| | * | | | | Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.soJames Dong2012-06-122-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a related-to-bug: 6647465
* | | | | | | am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" ↵Christopher Tate2012-06-121-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '4cabbef8266c909997cf608d008920f5a2f49937': Make sure to stop noHistory="true" activities properly
| * | | | | | Merge "Make sure to stop noHistory="true" activities properly" into jb-devChristopher Tate2012-06-121-1/+3
| |\ \ \ \ \ \
| | * | | | | | Make sure to stop noHistory="true" activities properlyChristopher Tate2012-06-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was correctly inducing a 'finish' when such an activity was being stopped, but then was not continuing with the rest of the stop bookkeeping at that point. In some circumstances this could result in an inconsistent state, with the activity marked as finishing but neither in the foreground nor stopped. Bug 6585403 Change-Id: Ib5c5be885bc6534e099e040d87a8589f7b7454ce
* | | | | | | | am 36eeb6a5: Merge "StatusBar: Respond properly to global expand message" ↵John Spurlock2012-06-121-8/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '36eeb6a5be895bfba0405d34062d0db5b118a329': StatusBar: Respond properly to global expand message
| * | | | | | | Merge "StatusBar: Respond properly to global expand message" into jb-devJohn Spurlock2012-06-121-8/+19
| |\ \ \ \ \ \ \
| | * | | | | | | StatusBar: Respond properly to global expand messageJohn Spurlock2012-06-121-8/+19
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timing issue in PhoneStatusBar#animateExpand(). Also, notification panel drag handle (when expanded) reflects movement immediately. To test animateExpand(): $ adb shell service call statusbar 1 Bug: 6629916 Change-Id: I22bb09fc4c9d97c93ba8d7aed8921b60f5ebd610
* | | | | | | | am 9c463d9d: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-126-36/+36
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c463d9d9f2601f139baad862b1b3276e126b12d': Import translations. DO NOT MERGE
| * | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-126-36/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEYing Wang2012-06-126-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafceb53cc46753f25f460609e9db6fa227c15032
* | | | | | | | | am 579ec308: Merge "MediaRouter work" into jb-devAdam Powell2012-06-124-12/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '579ec3086c9ce3616735bc3cf63246f052973a7f': MediaRouter work
| * | | | | | | | Merge "MediaRouter work" into jb-devAdam Powell2012-06-124-12/+34
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MediaRouter workAdam Powell2012-06-124-12/+34
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where MediaRouter would crash on creation Add click listener for app-supplied extended settings on the route selection dialog. Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
* | | | | | | | | am ceb80679: Merge "make the boot animation 32-bits to avoid banding" into ↵Justin Ho2012-06-121-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'ceb8067920043a430478be386c56c244355d4c9f': make the boot animation 32-bits to avoid banding
| * | | | | | | | Merge "make the boot animation 32-bits to avoid banding" into jb-devJustin Ho2012-06-121-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | make the boot animation 32-bits to avoid bandingMathias Agopian2012-06-111-1/+1
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6611693 Change-Id: Id31b711ea755c89240eaea26f6403a031cd939e4
* | | | | | | | am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into ↵Eric Laurent2012-06-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'dcf33b73159fe864f80514919775598e797e37d2': Made IAudioService.setBluetoothA2dpOn() not oneway
| * | | | | | | Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-devEric Laurent2012-06-121-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Made IAudioService.setBluetoothA2dpOn() not onewayEric Laurent2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAudioService.setBluetoothA2dpOn() should not be one way as IAudioService.isBluetoothA2dpOn() will return inconsistent results if called just after. Bug 6572651. Change-Id: Ib03ae49e6c0041b1b37dcac9e198cd93a4794030
* | | | | | | | | am 56b135b9: Merge "Put PLMN and SPN on one line in the notification panel." ↵Daniel Sandler2012-06-122-22/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '56b135b91051664ae9027f50e9f20b7fcf6565ba': Put PLMN and SPN on one line in the notification panel.
| * | | | | | | | Merge "Put PLMN and SPN on one line in the notification panel." into jb-devDaniel Sandler2012-06-122-22/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Put PLMN and SPN on one line in the notification panel.Daniel Sandler2012-06-112-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now match the keyguard's presentation: either plmn, or spn, or "plmn|spn" (concatenated with a pipe). Bug: 6639047 Change-Id: Ia6ae9085fbf2fe9fa4465a6f7825cb997db5e6c5
* | | | | | | | | | am 2c1a4c05: Merge "Suppress header flash when collapsing notifications ↵Daniel Sandler2012-06-123-9/+37
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel." into jb-dev * commit '2c1a4c05b83e0461169bb846765ae415b4e79fcf': Suppress header flash when collapsing notifications panel.
| * | | | | | | | | Merge "Suppress header flash when collapsing notifications panel." into jb-devDaniel Sandler2012-06-123-9/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Suppress header flash when collapsing notifications panel.Daniel Sandler2012-06-113-9/+37
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutTransition is poking through and it shouldn't be. This change also fixes a few related animation glitches around the carrier label and fling velocity. Bug: 6628429 Change-Id: I6655c9f9a8c95c7abd9c6d7099957cb229b86d5a
* | | | | | | | | | am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-devGilles Debunne2012-06-121-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a447eaca555e45ebbbc5e4de2762e19dbca12980': Prevent a crash when maxLines is set to 0
| * | | | | | | | | Merge "Prevent a crash when maxLines is set to 0" into jb-devGilles Debunne2012-06-121-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Prevent a crash when maxLines is set to 0Gilles Debunne2012-06-111-0/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6642222 Using setMaxLines(0) and setMinHeight(30) causes a crash because Layout#getLineRangeForDraw() returns a [0,0] interval in that case. Accessing the Direction in draw causes a NPE. Change-Id: If50f9b554e3cdc598a721b623992e9196982838c
* | | | | | | | | | am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-devDianne Hackborn2012-06-121-4/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5': Fix issue #6634325: View.setKeepScreenOn and...
| * | | | | | | | | Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-devDianne Hackborn2012-06-121-4/+21
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Fix issue #6634325: View.setKeepScreenOn and...Dianne Hackborn2012-06-111-4/+21
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...MediaPlayer.setScreenOnWhilePlaying seem broken We need to correctly clear the keep screen on flag when the view hierarchy request is gone... and to do that, we need to keep the actual state of the flag requested by the app. Also when the app changes its state, we need to compute the proper value based on both the app request and any requests in the view hierarchy. Bug: 6634325 Change-Id: I060e9a34a10faffbaa77c06098cf21298bb4969f
* | | | | | | | | am f958732b: Merge "Fix docs" into jb-devAdam Powell2012-06-121-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f958732bd3924205d9f8bda94f4f6e3bb4045b28': Fix docs
| * | | | | | | | Merge "Fix docs" into jb-devAdam Powell2012-06-111-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix docsAdam Powell2012-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0215c02abf419d14f28574b751c9dfc2f27bcbe
* | | | | | | | | | am ea6b8188: Merge "Improve ANR diagnostics." into jb-devJeff Brown2012-06-123-46/+134
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea6b8188320202da072285b08fe6c0ee5c3f71e5': Improve ANR diagnostics.
| * | | | | | | | | Merge "Improve ANR diagnostics." into jb-devJeff Brown2012-06-113-46/+134
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Improve ANR diagnostics.Jeff Brown2012-06-113-46/+134
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an ANR occurs, log the associated reason. When an event takes too long to process (currently more than 2 seconds) log basic information about the event including how long it actually took. Dump the contents of the inbound, outbound and wait queues as part of dumpsys input. Bug: 6574842 Change-Id: I9ab754c320f609cb86fe266c469a61e7032dfed6
* | | | | | | | | am ae20ae1a: More MediaRouter features.Adam Powell2012-06-122-0/+73
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae20ae1a8aaa013813c356ae1d9541ca7ff020ae': More MediaRouter features.
| * | | | | | | | More MediaRouter features.Adam Powell2012-06-112-0/+73
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RemoteControlClient to user routes. This will allow the UI layered on top to access info about the remote volume channel associated with a user route. Add icons for user routes and route groups. Change-Id: I438aa60fc8c93f878ec7638897225738155f0746
* | | | | | | | am 68cefd20: Merge "Textured text calls could be invisible Bug #6597730" ↵Romain Guy2012-06-122-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '68cefd201809372a547257a273b805cabbd0da68': Textured text calls could be invisible Bug #6597730
| * | | | | | | Merge "Textured text calls could be invisible Bug #6597730" into jb-devRomain Guy2012-06-112-0/+5
| |\ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-27 17:33:44 +0000