77109 Commits

Author SHA1 Message Date
Raph Levien
3816174b3b Add explicit id for fontFamily attribute.
The merge for the attribute crossed in flight with making jb-dev a
release branch.

Change-Id: Ic9a2a34a8e3c54efa17a98365f58f24fe365b532
2012-05-11 11:48:57 -07:00
Chet Haase
1a3ab175b0 Fix quickReject logic for transformed views
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
2012-05-11 11:03:12 -07:00
Chet Haase
4a70bc72a8 am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev
* commit '26511012c40dbe704f4791654b28b9e0e05589d8':
  Clear animations in DisplayLists when done
2012-05-11 10:59:53 -07:00
Chet Haase
26511012c4 Merge "Clear animations in DisplayLists when done" into jb-dev 2012-05-11 10:57:40 -07:00
Jamie Gennis
24dae6c611 Trace: add a tracing tag for video
Change-Id: If4c3c76b049a475ca99eb258dc3d432435e77dc0
2012-05-11 10:43:44 -07:00
Jamie Gennis
78b8ef3f3a Surface: replace active rect with window crop
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
2012-05-11 10:42:49 -07:00
Romain Guy
30b013bfba am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev
* commit 'd303dd3da2af272d0beaac956a12e145b8386f45':
  Prevent NPE in TextureView.getBitmap()
2012-05-11 10:27:54 -07:00
Romain Guy
d303dd3da2 Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev 2012-05-11 10:25:06 -07:00
Teng-Hui Zhu
9895881b2c am 9ac32040: Merge "Keep the controller when video ended." into jb-dev
* commit '9ac320406bcd0212923bfc0b4068df0b022fd4f7':
  Keep the controller when video ended.
2012-05-11 10:02:15 -07:00
Teng-Hui Zhu
b5005a544f am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev
* commit '6df5ca08f192e2b831c6cf216f3a2cfe63456ad0':
  Avoid inline->fullscreen reload for html5 video.
2012-05-11 10:02:12 -07:00
Romain Guy
78245f77d2 Prevent NPE in TextureView.getBitmap()
This crash could occur when invoking setSurfaceTexture() then getBitmap()
before the View has a chance to be drawn.

Change-Id: I25c55df15750e59b9c916e8f750de2c89718d39e
2012-05-11 10:01:42 -07:00
Teng-Hui Zhu
9ac320406b Merge "Keep the controller when video ended." into jb-dev 2012-05-11 10:00:06 -07:00
Teng-Hui Zhu
6df5ca08f1 Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 2012-05-11 09:59:57 -07:00
Raph Levien
641ce591a6 am c9c275fe: Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev
* commit 'c9c275fe5c54f12ce66440ea0d28ff35d67ebdff':
  Add RobotoCondensed family and optimized Roboto Light.
2012-05-11 09:40:04 -07:00
Raph Levien
c9c275fe5c Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev 2012-05-11 09:37:14 -07:00
Raph Levien
a9cc30ce59 am 75ef98f8: Merge "Add fontFamily XML attribute to select font family by string" into jb-dev
* commit '75ef98f8210fa1845d04a6e8206f4c7be5499052':
  Add fontFamily XML attribute to select font family by string
2012-05-11 09:33:22 -07:00
Raph Levien
75ef98f821 Merge "Add fontFamily XML attribute to select font family by string" into jb-dev 2012-05-11 09:31:22 -07:00
Chris Wren
cef4dda471 am 156c7928: Merge "Don\'t allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion." into jb-dev
* commit '156c79289dec581536c0ee23ffaa355909827587':
  Don't allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion.
2012-05-11 09:30:29 -07:00
Chris Wren
156c79289d Merge "Don't allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion." into jb-dev 2012-05-11 09:28:08 -07:00
Andrew Flynn
1ba2f7bd48 am b23341e4: Merge "Move airplane icon to its own view" into jb-dev
* commit 'b23341e4c55667de6408f64206cb44c174d36121':
  Move airplane icon to its own view
2012-05-11 09:10:21 -07:00
Andrew Flynn
b23341e4c5 Merge "Move airplane icon to its own view" into jb-dev 2012-05-11 09:08:15 -07:00
Kenny Root
343331fa02 Add in constant for WPA supplication settings
This constant indicates what should be sent when a wpa_supplicant's
engine field should be marked as "disable."

Bug: 6480500
Change-Id: Ic963eff4b2ae1496f06e23f80514bf530767c568
2012-05-11 09:07:53 -07:00
Chris Wren
ca7b7d0566 Don't allow notificaitons to be larger than 4U, even with actions.
Limit BigText template to a fixed number of lines.
Optimize layout of BigText and Inbox for expansion.

Bug: 6457470
Change-Id: Ib7389e16e566df9f91347ca3fdd621916a12af9b
2012-05-11 09:00:45 -07:00
Daniel Sandler
b0c8102af4 am bf6e0ba9: Don\'t show rotation lock on phone-sized devices.
* commit 'bf6e0ba99dbfef44d3feb014ce7e530de800d7c2':
  Don't show rotation lock on phone-sized devices.
2012-05-11 08:23:38 -07:00
Daniel Sandler
bf6e0ba99d Don't show rotation lock on phone-sized devices.
Bug: 6476409
Change-Id: Ife4476ab08a96337fe78ef2892ac5d73f90b3e8c
2012-05-11 10:41:18 -04:00
satok
da0ff4de32 am bec154c5: Allow the spell checker to remove existing misspelled spans
* commit 'bec154c50036bc70a37518dc93f6821209f58728':
  Allow the spell checker to remove existing misspelled spans
2012-05-11 03:31:32 -07:00
Pin Ting
852be16790 Fix typo in javadoc.
Change-Id: I0e5d8640764772871e72cb00d117d12f3eaeb64f
2012-05-11 18:09:58 +08:00
satok
bec154c500 Allow the spell checker to remove existing misspelled spans
Bug: 6451163
Change-Id: If018533e8855e9dc21ab2a09ae31aa80ef260b72
2012-05-11 17:34:01 +09:00
Wink Saville
85dc303f80 am e9aa4b27: Merge "Add additional debug for time zone handling." into jb-dev
* commit 'e9aa4b27af4fe68b999f906aea80847fa1f4b0d8':
  Add additional debug for time zone handling.
2012-05-10 23:15:59 -07:00
satok
0b8d272eed am 37e169cd: Add a safety net to set range span in the spell checker
* commit '37e169cd1429c76a0223d8fdd77622ead718bbff':
  Add a safety net to set range span in the spell checker
2012-05-10 23:15:57 -07:00
Wink Saville
e9aa4b27af Merge "Add additional debug for time zone handling." into jb-dev 2012-05-10 23:05:54 -07:00
Jim Miller
4c351d62e7 Fix 6040870: Update MultiWaveView for new device
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
2012-05-10 21:36:56 -07:00
satok
37e169cd14 Add a safety net to set range span in the spell checker
Bug: 6476578
Change-Id: I60ad82f80770dcb67fd9663dac64dc81634d7014
2012-05-11 12:56:13 +09:00
Dianne Hackborn
ef9876a651 am fa61f0b2: JellyBean is now 4.1.
* commit 'fa61f0b2e25382d3a8ea35024dd227606151e87a':
  JellyBean is now 4.1.
2012-05-10 19:10:36 -07:00
Dianne Hackborn
fa61f0b2e2 JellyBean is now 4.1.
Change-Id: Ie37a7c4356d593010686d5dc7d6e715d30099e1e
2012-05-10 19:02:19 -07:00
Jean-Michel Trivi
4294b83927 Start voice-based interactions from headsethook key
Implement the interception of long-press on keys that
 can be used to trigger voice-based interactions (here
 only HEADSETHOOK) only if the long-press hasn't been
 trapped by the foreground application:
 - if the key is not one that is used for voice input, handle
   the event as before.
 - if the key press wasn't long enough, simulate a delayed
   key press.
 - if long press is detected, send
   RecognizerIntent.ACTION_WEB_SEARCH. Long press duration
   is set to 300ms (a typical key press is under 100ms).

Bug 3225090

Change-Id: I5b3adeb91d3c41ccd54d23fdb93d7eaec496eee7
2012-05-10 18:42:31 -07:00
Mike Lockwood
f61adad3a7 am 8d8176d4: Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev
* commit '8d8176d41b8b8f08435e727f03e43e27a542dcc2':
  AudioService: Fix problem handling USB audio disconnect
2012-05-10 18:01:06 -07:00
Mike Lockwood
8d8176d41b Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev 2012-05-10 17:58:47 -07:00
Mike Lockwood
9841818b9a AudioService: Fix problem handling USB audio disconnect
Also broadcast ACTION_AUDIO_BECOMING_NOISY on USB audio disconnect

Change-Id: I46dfcc744df880066aea6bf651334a081c14af0f
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-05-10 17:49:30 -07:00
Eric Laurent
d2261486fa am 304521b7: Merge "AudioService: fix various volume issues." into jb-dev
* commit '304521b7cf6f54b4ae6089d0b38eb495376061b1':
  AudioService: fix various volume issues.
2012-05-10 17:43:00 -07:00
Eric Laurent
304521b7cf Merge "AudioService: fix various volume issues." into jb-dev 2012-05-10 17:40:26 -07:00
Raph Levien
467ea51617 Add RobotoCondensed family and optimized Roboto Light.
This adds the Roboto Condensed family (with the name
sans-serif-condensed, for consistency with existing family names).

Change-Id: Ied2c509ebbb2b3b8637c659e62c9a821b6941eaa
2012-05-10 17:28:20 -07:00
Teng-Hui Zhu
4dd9dc8204 Keep the controller when video ended.
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
2012-05-10 17:23:24 -07:00
Eric Laurent
2448201852 AudioService: fix various volume issues.
Fix various issues in adjustStreamVolume() related to stream type aliases
using different ranges.

Always Update last audible index on all streams sharing the same alias.

Add check on setRingerMode() to prevent setting mode to VIBRATE when no
vibrator is present.

Issue 6455831.

Change-Id: Id110e05d2f16e208e1e398922617bf31967b62db
2012-05-10 17:20:26 -07:00
Brandon Keely
9dfce94a29 am 86f23aaa: Merge "fragment transitions" into jb-dev
* commit '86f23aaa7c86f57a381f49147e5a4454b82fc169':
  fragment transitions
2012-05-10 16:48:40 -07:00
Teng-Hui Zhu
c2b06d5a83 Avoid inline->fullscreen reload for html5 video.
Now when a user start inline play and then switch to full screen, there is no
reload any more.
Basically, we change mediaplayer as a static member, and detect possible
situation to skip the prepare work.

bug:5710646

Change-Id: Ida34cf2e919a6cc8e0d52cd1175d51b5f5d527f7
2012-05-10 16:46:51 -07:00
Brandon Keely
86f23aaa7c Merge "fragment transitions" into jb-dev 2012-05-10 16:46:40 -07:00
Jim Miller
556d48f5a3 am fef47f42: Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev
* commit 'fef47f422aef44a69aa1a417ef671d6934c5ed1f':
  Fix 6398209: Improve MultiWaveView animations and interaction
2012-05-10 16:43:48 -07:00
Jim Miller
fef47f422a Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev 2012-05-10 16:41:55 -07:00
Dianne Hackborn
00389a5198 am b1b55e6c: Fix build.
* commit 'b1b55e6c6b079d75c13dcc23ca3ebce847bb42f8':
  Fix build.
2012-05-10 16:30:54 -07:00