76888 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dianne Hackborn
b1b55e6c6b Fix build.
Change-Id: Ie255c93442d0b62032ac25e6de97f2c03e5df3ba
2012-05-10 16:25:54 -07:00
Wink Saville
26e1a02ba3 Add additional debug for time zone handling.
Change-Id: Ie46bba7e0ef7737a865f7efadbf963c2d14e488f
2012-05-10 16:23:39 -07:00
Brandon Keely
963daf28e5 fragment transitions
Change-Id: I8a3078b32b9543dd1b3a79231c3199f842f3cfd1
2012-05-10 16:18:17 -07:00
Jim Miller
10c66afbd0 Fix 6398209: Improve MultiWaveView animations and interaction
TargetDrawables now have a "home" position they can be scaled about.
Added new "focused" state to TargetDrawable.  This is used to distinguish between highlight and selection.
Updated target icons to use new focused state. Currently re-uses "activated" icon.
Change to event handling to allow cancel events when a target is highlighted to cause a selection.
Cleaned up MultiWaveView initialization code.

MultiWaveView animation improvements:
 - new scale animation when center handle is touched.
 - switched to using indices instead of foreach loops in critical path code to avoid creating temporary objects.
 - updated and simplified animation code.

Change-Id: I593c021475f1644c73bdb9f84855e6a9fec7c0ab
2012-05-10 15:59:03 -07:00
Daniel Sandler
6ad1105806 am f54bfcf5: Merge "Restyling action buttons." into jb-dev
* commit 'f54bfcf5a3594d7d8423391be68d9b982ea6c4fa':
  Restyling action buttons.
2012-05-10 15:46:11 -07:00
Daniel Sandler
f54bfcf5a3 Merge "Restyling action buttons." into jb-dev 2012-05-10 15:44:16 -07:00
Eric Fischer
2c914da6db am 4e90bb53: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '4e90bb536ae7430978eeef5c287b11a72ea4c023':
  Import translations. DO NOT MERGE
2012-05-10 15:42:59 -07:00
Eric Fischer
f3abef098a am 6deb7bca: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '6deb7bcad7299bb3265bbe635ebc0805120ec159':
  Import translations. DO NOT MERGE
2012-05-10 15:39:25 -07:00
Eric Fischer
4e90bb536a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-10 15:39:07 -07:00
Eric Fischer
6deb7bcad7 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-10 15:37:20 -07:00
Dianne Hackborn
de888fec6b am 255d1e15: Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting..." into jb-dev
* commit '255d1e1540833fb1980791b2e340cad4cb18b3b7':
  Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting...
2012-05-10 15:36:12 -07:00
Dianne Hackborn
255d1e1540 Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting..." into jb-dev 2012-05-10 15:32:32 -07:00
Eric Laurent
faf233585b am 24938df9: Merge "AudioService: synchronized access to volume index" into jb-dev
* commit '24938df9e44dbed2ea9c72370907fe403674ee00':
  AudioService: synchronized access to volume index
2012-05-10 15:23:17 -07:00
Eric Laurent
24938df9e4 Merge "AudioService: synchronized access to volume index" into jb-dev 2012-05-10 15:20:08 -07:00
Dianne Hackborn
cf67578c7f Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting...
...incorrect visibility when the ActionBar overflow menu is opened

Don't report layout flags in system UI visibility callback.  Update
docs to reflect this.

Change-Id: Icfa411b5537de037cafbcac04991101e8b9138c4
2012-05-10 15:07:24 -07:00
Kenny Root
42a419b4c0 am 718af32a: Merge "Use long instead of int for file offsets" into jb-dev
* commit '718af32a191066822262ad05cdd525a09c66094f':
  Use long instead of int for file offsets
2012-05-10 14:57:34 -07:00