summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix 6486099: Fix clipping issues with MultiWaveView on phone/tabletJim Miller2012-05-129-21/+16
| | | | | | | | | | | | | This fixes a problem where the bounds of the view weren't being calculated properly when a separate outer radius was specified. The code now takes the maximum of the ring drawable's width/height and that specified in the resource files. This gives it the best default look on all devices while still allowing minor tweaks. Change-Id: I5daa40ff4f14653c8cc89b39102816afb976e4f7
* Merge "Trace: add a tracing tag for video" into jb-devJamie Gennis2012-05-111-0/+1
|\
| * Trace: add a tracing tag for videoJamie Gennis2012-05-111-0/+1
| | | | | | | | Change-Id: If4c3c76b049a475ca99eb258dc3d432435e77dc0
* | Merge "Surface: replace active rect with window crop" into jb-devJamie Gennis2012-05-113-37/+24
|\ \ | |/
| * Surface: replace active rect with window cropJamie Gennis2012-05-113-37/+24
| | | | | | | | | | | | | | | | | | This change replaces the setActiveRectCrop method on Surface, which was called from app processes, with the setWindowCrop method that is to be called from the window manager. Bug: 6299171 Change-Id: Ica51efcd8c488a526e7013b83d80df4856694519
* | Merge "Update assets that didn't scale nicely from hdpi to tvdpi." into jb-devAmith Yamasani2012-05-1142-0/+0
|\ \
| * | Update assets that didn't scale nicely from hdpi to tvdpi.Amith Yamasani2012-05-1142-0/+0
| | | | | | | | | | | | | | | Bug: 6430949 Change-Id: I197043c3da0295e09abfbb4ae5582c2542ecbcd8
* | | Merge "Add fallback fonts for Malayalam, Kannada, and Telugu scripts" into ↵Victoria Lease2012-05-112-4/+33
|\ \ \ | | | | | | | | | | | | jb-dev
| * | | Add fallback fonts for Malayalam, Kannada, and Telugu scriptsVictoria Lease2012-05-082-4/+33
| | | | | | | | | | | | | | | | | | | | Bug: 6232193 Change-Id: If0ba9fd15560d2e5e91712b3f954f139d8c081b1
* | | | Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into ↵James Dong2012-05-115-82/+104
|\ \ \ \ | | | | | | | | | | | | | | | jb-dev
| * | | | Improve notifying TimedText by reducing marshall/unmarshalling.Insun Kang2012-05-095-82/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Removes mParcel from TimedText class. o Converts native parcel into java parcel object directly without copying to an intermediate byte array. o JNIMediaPlayerListener::notify checks for Java exceptions, logs them, and clears the exception state. related-to-bug: 6405934 Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
* | | | | Merge "Automatic persistent text selection for ListViews" into jb-devAdam Powell2012-05-114-11/+48
|\ \ \ \ \
| * | | | | Automatic persistent text selection for ListViewsAdam Powell2012-05-114-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use View transient state tracking to allow selection to persist across ListView-style item view recycling. Fix some bugs with transient state tracking. Bug 6110122 Change-Id: Ic084b8fc2289bff718b19478a37ce64459b3ed4c
* | | | | | Merge "Cut long text into multiple DL at start" into jb-devGilles Debunne2012-05-111-8/+65
|\ \ \ \ \ \
| * | | | | | Cut long text into multiple DL at startGilles Debunne2012-05-111-8/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5763685 To improve performance, preventively cut the the into display list of 3-10 lines of text. Further updates to small parts of the text (such as adding an underline on a word) will only invalidate and redraw the affected sub display list. DLs are aligned with paragraphs, just like they will be during text edition. Change-Id: I0d60debc7fdaea8b29080a6eacb2d60205e7d547
* | | | | | | Merge "Keep launcher screen from flashing over lockscreen" into jb-devCraig Mautner2012-05-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Keep launcher screen from flashing over lockscreenCraig Mautner2012-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the force hide period to include the animation. Fixes bug b6471929. Change-Id: I91daf9dc678723be4c69913aa5a3aa0e265d103e
* | | | | | | | Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered ↵Fabrice Di Meglio2012-05-111-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | weirdly" into jb-dev
| * | | | | | | | Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdlyFabrice Di Meglio2012-05-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add missing ZWS (uni200B), ZWNJ (uni200C), ZWJ (uni200D) Change-Id: I2e70bbaa855a75e0172c375cfcbc8544325030da
* | | | | | | | | Merge "Add in constant for WPA supplication settings" into jb-devKenny Root2012-05-111-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add in constant for WPA supplication settingsKenny Root2012-05-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This constant indicates what should be sent when a wpa_supplicant's engine field should be marked as "disable." Bug: 6480500 Change-Id: Ic963eff4b2ae1496f06e23f80514bf530767c568
* | | | | | | | | | Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-devJeff Sharkey2012-05-114-11/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enforce READ_EXTERNAL through Settings.Secure.Jeff Sharkey2012-05-114-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always defers to user-defined setting, when present. Bug: 6389556 Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
* | | | | | | | | | | Merge "Fix 6040870: Update MultiWaveView for new device" into jb-devJim Miller2012-05-1112-48/+103
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix 6040870: Update MultiWaveView for new deviceJim Miller2012-05-1012-48/+103
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows more flexibility in target placement in MultiWaveView. It now supports a new way of specifying chevron drawables that allows them to be moved in directions corresponding to more than the four basic directions (right, up, left, down). Chevron drawables can now be updated in an overlay. This change also adds a place holder and makes a minor tweak to the layout on 720dp devices where the navbar buttons weren't centered. Change-Id: Icd319ec5f276870380e27737c873e78f599ff751
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-1119-121/+61
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-1119-121/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id093bff086183247032385b05d314ea0ef7d3b8b
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-1118-136/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-1118-136/+68
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id65875321fa8c95e5909d901c080396f702bad02
* | | | | | | | | | | | Merge "Fix wifi direct issues" into jb-devIrfan Sheriff2012-05-113-19/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix wifi direct issuesIrfan Sheriff2012-05-113-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - BSS command is unreliable, use group owner information from p2p_find - Fix the autonomousgroup settings - Use group idle settings only on the p2p group interface to avoid group idle resulting group formation failures Bug: 6426991 Change-Id: I44fc204775580fb4fec6ce27070ddbde0751b495
* | | | | | | | | | | | | Merge "Test clamp (full and relaxed precision)." into jb-devStephen Hines2012-05-115-0/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Test clamp (full and relaxed precision).Stephen Hines2012-05-105-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=6127576 Change-Id: I9501be7db42daa11dcc71bd619a993c80ef097de
* | | | | | | | | | | | | | Merge "Prevent updateStateTrackers from being affected by preventDefault()" ↵John Reck2012-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev
| * | | | | | | | | | | | | | Prevent updateStateTrackers from being affected by preventDefault()John Reck2012-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6477996 Calling e.preventDefault() on a javascript touch handler is apparantly not supposed to prevent the default gesture detector, who knew? Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
* | | | | | | | | | | | | | | Merge "Minor refactoring before starting on velocity tracker changes." into ↵Jeff Brown2012-05-1111-685/+811
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev
| * | | | | | | | | | | | | | | Minor refactoring before starting on velocity tracker changes.Jeff Brown2012-05-1111-685/+811
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6413587 Change-Id: I5eba2bb57193bff78cb3740de5f87aca0b31d154
* | | | | | | | | | | | | | | | Merge "Fix a crash." into jb-devTeng-Hui Zhu2012-05-111-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix a crash.Teng-Hui Zhu2012-05-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | End can happen when error happens, but media controller may be not ready yet. bug:5340224 Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
* | | | | | | | | | | | | | | | | Merge "Fix quickReject logic for transformed views" into jb-devChet Haase2012-05-111-0/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix quickReject logic for transformed viewsChet Haase2012-05-111-0/+65
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a parent draws its child views, each child's bounds is checked against the current dirty region. If the view falls outside of that region is is rejected and doesn't enter into the parent's DisplayList. This works in general, for both transformed and untransformed views (because we skip this check if the view is transformed). But it breaks down when the transform properties of the view change later, since DisplayList properties simply push these values down to the view's DisplayList without invalidating the parent. If a view is rejected when untransformed, then there is nothing to cause it to be considered again until something causes an invalidate of the parent. The fix is to note when a view is rejected and record that information. Later, when one of the transform-related properties change, we invalidate the parent to force the check to happen again, which will cause the view to get drawn if it's visible. Issue #6477730 quickRejected views must recreate their DisplayLists on transform changes Change-Id: I70caf198005cd7e424a37bccc6ae050e09880a6c
* | | | | | | | | | | | | | | | Rename kcm attribute to keyboardLayout.Jeff Brown2012-05-117-43/+44
| |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6478076 Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
* | | | | | | | | | | | | | | Add explicit id for fontFamily attribute.Raph Levien2012-05-111-2/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge for the attribute crossed in flight with making jb-dev a release branch. Change-Id: Ic9a2a34a8e3c54efa17a98365f58f24fe365b532
* | | | | | | | | | | | | | Merge "Clear animations in DisplayLists when done" into jb-devChet Haase2012-05-112-10/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Clear animations in DisplayLists when doneChet Haase2012-05-102-10/+29
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The matrix calculated by Animations is pushed down to the native DisplayList object, and is then used when the DL is issued to the GL renderer. This works while the animation is running, but the end of animations is not handled correctly. In particular, we never clear the animation, so whatever the last frame of the animation calculated will persist on that DisplayList object until it is recreated. The fix is to note when we used to be animating and are no longer doing so, taking that opportunity to push the cleared state down to the DisplayList. Issue #6448993 action bar -- including settings menu -- disappears on Nakasi Change-Id: I73cdadaef40d87ccbc1beb02599c4d70506ea42b
* | | | | | | | | | | | | Merge "Prevent NPE in TextureView.getBitmap()" into jb-devRomain Guy2012-05-111-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Prevent NPE in TextureView.getBitmap()Romain Guy2012-05-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This crash could occur when invoking setSurfaceTexture() then getBitmap() before the View has a chance to be drawn. Change-Id: I25c55df15750e59b9c916e8f750de2c89718d39e
* | | | | | | | | | | | | Merge "Keep the controller when video ended." into jb-devTeng-Hui Zhu2012-05-113-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Keep the controller when video ended.Teng-Hui Zhu2012-05-103-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the media controller as a reminder to the user when the video ended. We don't quit the video here b/c user may want to replay the video. bug:5340224 Change-Id: I6d5fdb54bb614277b75e1a18ebe0a7dadd47017e
* | | | | | | | | | | | | | Merge "Avoid inline->fullscreen reload for html5 video." into jb-devTeng-Hui Zhu2012-05-114-55/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |