Eric Fischer
49d03616ab
Merge "Import translations. DO NOT MERGE"
2012-06-21 13:11:06 -07:00
Eric Fischer
cda6996408
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-21 13:10:49 -07:00
Eric Fischer
cb156bb37d
Import translations. DO NOT MERGE
...
Change-Id: I8a12ed839f28470b743707320c7ce2e04bfd0096
2012-06-21 13:05:10 -07:00
Craig Mautner
4f5d1511b9
Make sure onScreenTurnedOn is called at power on.
...
KeyguardViewMediator.onScreenTurnedOn is not called if the device is
booted into the power-on state. In this case mScreenOn remains false
and the lockscreen will always appear after outgoing calls. This fix
ensures that onScreenTurnedOn is called when the device is powered
up in the on state.
Fixes bug 6709173.
Change-Id: I7557d8f002307b9125bc53b13bc3cb4c5c9b2758
2012-06-21 13:03:41 -07:00
Eric Fischer
ed6103d573
Import translations. DO NOT MERGE
...
Change-Id: If3ebb62b4c2a912512600e51129551e23cf31553
2012-06-21 12:57:27 -07:00
Jake Hamby
dcd6e38c6a
am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev
...
* commit '65d4445bfd3351609f786fdf6038ddd362a3d6ca':
Add config option to enable links to Cell Broadcast app.
2012-06-21 12:34:35 -07:00
Jake Hamby
65d4445bfd
Merge "Add config option to enable links to Cell Broadcast app." into jb-dev
2012-06-21 12:32:39 -07:00
Jake Hamby
43af7e0756
Add config option to enable links to Cell Broadcast app.
...
Add "config_cellBroadcastAppLinks" internal boolean config item,
defaulting to false. For devices with the Cell Broadcast app,
setting this config option to true will add a menu item to the
MMS app to jump to the list of received cell broadcasts, and a
preferences item to Settings to jump to cell broadcast settings.
Bug: 6709985
Change-Id: I9fe1919e6d76ba1dfe1e1381e2c38ecdd5e0a867
2012-06-21 12:17:18 -07:00
Romain Guy
eb129a266c
am 16613476: am 0d6f4c06: Dejank: don\'t allocate when scrolling lists
...
* commit '16613476c80f20736ef6bd3d217ab56aa57b03c9':
Dejank: don't allocate when scrolling lists
2012-06-21 12:03:58 -07:00
Adam Powell
c7be481af1
am fd7ea067: am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev
...
* commit 'fd7ea06787f0be4def188621888d228f38f3a4d1':
MediaRouter group volume reporting
2012-06-21 12:03:55 -07:00
Eric Fischer
18f4fefb85
am 7059a022: (-s ours) am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '7059a022fec306121885f207b4ab89d4302967a0':
Import translations. DO NOT MERGE
2012-06-21 12:03:53 -07:00
Chris Wren
70a7be0799
am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.
...
* commit 'ed5cc0e1f7648962f5c93e1277d282be75bcd537':
revert I057b7ac0 now that the layouts are the expected height.
2012-06-21 12:03:43 -07:00
Daniel Sandler
63d842cc4d
am d5353b47: Fix docs
...
* commit 'd5353b475001f19e3cbc9c1a4165c9e6038a812f':
Fix docs
2012-06-21 11:52:38 -07:00
Daniel Sandler
0a43f67ef3
am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
...
* commit '790024bfe6dd2765dd5e552053797459aab72da1':
Unhide new methods on RemoteViews and Notification.
2012-06-21 11:52:34 -07:00
Romain Guy
16613476c8
am 0d6f4c06: Dejank: don\'t allocate when scrolling lists
...
* commit '0d6f4c06df0b0e35125f088ca028c7226b274dc4':
Dejank: don't allocate when scrolling lists
2012-06-21 11:52:22 -07:00
Adam Powell
fd7ea06787
am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev
...
* commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648':
MediaRouter group volume reporting
2012-06-21 11:52:19 -07:00
Eric Fischer
7059a022fe
am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'da036c8a5709d5b985e0dd63c379e93135768c81':
Import translations. DO NOT MERGE
2012-06-21 11:52:11 -07:00
Kenny Root
a9543a3dad
Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks."
2012-06-21 11:05:55 -07:00
George Mount
d594047f8f
Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS
...
Remove an unused #define and code associated with it. This will
smooth a possible future webkit merge.
WebKit change: I16d8c457a3f08996bc66401b241fe0db5a118975
Change-Id: Ibf046337cdabb9bee9cff8e3d77d9f69a59ecb15
2012-06-21 10:19:56 -07:00
Chris Wren
ed5cc0e1f7
revert I057b7ac0 now that the layouts are the expected height.
...
Bug: 6546766
Change-Id: I736290b897b864228ecc3e46d86ef566efda1efd
2012-06-21 13:07:29 -04:00
Victoria Lease
ef472603c8
Merge "Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"""
2012-06-21 10:07:12 -07:00
Victoria Lease
9cbf117d36
Merge "Revert "Revert "Elegant fonts for Webkit, Compact fonts for Textview (Data)"""
2012-06-21 10:07:03 -07:00
Billy Hewlett
960511848a
Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""
...
This reverts commit 6fadccd2484233ed570218b3f97c085ef1a1ec28
2012-06-21 09:58:42 -07:00
Billy Hewlett
973835b264
Revert "Revert "Elegant fonts for Webkit, Compact fonts for Textview (Data)""
...
This reverts commit f49a19e96b721c89d4fe2f579f201b5c5ae86531
2012-06-21 09:57:57 -07:00
Victoria Lease
522469d217
Merge "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""
2012-06-21 09:49:52 -07:00
Victoria Lease
db51f79dc8
Merge "Revert "Elegant fonts for Webkit, Compact fonts for Textview (Data)""
2012-06-21 09:49:48 -07:00
Billy Hewlett
6fadccd248
Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"
...
This reverts commit ecf80965d05e44b3701b3392aeb02028daacf1b0
2012-06-21 09:45:30 -07:00
Billy Hewlett
f49a19e96b
Revert "Elegant fonts for Webkit, Compact fonts for Textview (Data)"
...
This reverts commit be97f1458bc90619ad68859dfdd0cb5f74daaa4d
2012-06-21 09:45:05 -07:00
Victoria Lease
f6c1689427
Merge "Elegant fonts for Webkit, Compact fonts for Textview (Data)"
2012-06-21 09:21:59 -07:00
Victoria Lease
8e91054983
Merge "Use Elegant fonts for Webkit, Compact fonts for Textview"
2012-06-21 09:21:56 -07:00
Michael Jurka
40d4676eab
Remove duplicate code to update wallpaper
2012-06-21 08:41:07 -07:00
The Android Automerger
bfc70a9a48
merge in jb-release history after reset to jb-dev
2012-06-21 07:02:40 -07:00
Daniel Sandler
d5353b4750
Fix docs
...
Change-Id: Ic5ff9aa07e65166a4ecaeecc5fb5e0091275bdcc
2012-06-21 09:29:51 -04:00
Daniel Sandler
790024bfe6
Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
2012-06-21 06:04:43 -07:00
Romain Guy
0d6f4c06df
Dejank: don't allocate when scrolling lists
...
The new display list properties introduces in JB were causing numerous
and expensive memory allocations while scrolling lists. During a scroll
ListView sometimes attempts to apply an offset to views before they are
drawn for the first time. This had the side effect of generating a new
IllegalStateException and its entire stack trace. The exception was
caught inside the display list and never seen by users.
Generating an exception is very expensive both in terms of allocated
memory and CPU time spent crawling the stack.
List scrolls/flings are a common case of this issue but it also happens
during various types of animations. A simple alpha animation, for instance,
can cause the problem to occur.
Another side effect of this issue is more frequent and longer GC pauses.
Change-Id: Ic1b37cc84f7c8f290209cfb990d030e96d6e0dc7
2012-06-21 00:39:35 -07:00
Adam Powell
d7c00d2bdd
Merge "MediaRouter group volume reporting" into jb-dev
2012-06-21 00:12:04 -07:00
Adam Powell
f8ac14a7f5
MediaRouter group volume reporting
...
RouteGroups always report back the loudest volume of their component
routes. Maintain this through volume update requests (such as those
reported by volume hard keys) such that each route updates
individually, but the group slider always indicates the loudest value.
Change-Id: I5de4b9048bf55682b6271e9485fe50496a1c97c2
2012-06-20 23:59:14 -07:00
Adam Powell
a08e6881c5
am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
...
* commit 'ed044cda8f6a7600923eecdec682c449f86e0429':
Expand volume APIs for MediaRouter
2012-06-20 22:45:09 -07:00
Eric Fischer
3650ce0479
Merge "Import translations. DO NOT MERGE"
2012-06-20 22:43:46 -07:00
Eric Fischer
2220c2ef87
Merge "Import translations. DO NOT MERGE"
2012-06-20 22:43:16 -07:00
Eric Fischer
da036c8a57
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-20 22:42:58 -07:00
Adam Powell
ed044cda8f
am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
...
* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
Expand volume APIs for MediaRouter
2012-06-20 22:35:44 -07:00
Jeff Brown
223d224fcb
am 071ed334: am fc32ec9a: Merge "Don\'t reset brightness to 0 on initial boot." into jb-dev
...
* commit '071ed3348739cb3f2bb9ef169067440c8c61b881':
Don't reset brightness to 0 on initial boot.
2012-06-20 22:34:42 -07:00
Hiroshi Lockheimer
5b0128c571
am e5934259: am b342cdd7: Merge "made the pressed state white" into jb-dev
...
* commit 'e5934259fc80b13ee6f54309fa23ee1889cb501a':
made the pressed state white
2012-06-20 22:34:39 -07:00
Pannag Sanketi
c83788cec9
am 4bae6149: am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev
...
* commit '4bae6149bd419eac00e5782a30d19463957e3c42':
Crash in SurfaceTextureTarget filter open
2012-06-20 22:34:36 -07:00
Craig Mautner
8f47078eb7
am e96f06ae: am 255cb779: Merge "Make animations persist after completion." into jb-dev
...
* commit 'e96f06ae1607be2af6fa810bb3913cac679d0ac9':
Make animations persist after completion.
2012-06-20 22:34:34 -07:00
Svetoslav Ganov
1ca3609a70
am e523faa8: am 5070a7f0: Merge "Change hard-coded URL for accessibility script." into jb-dev
...
* commit 'e523faa84f656785adbbd67414f9a141ec49d800':
Change hard-coded URL for accessibility script.
2012-06-20 22:34:31 -07:00
Hung-ying Tyan
9c42639cdd
am cc9a4e3e: am 927c7fd1: Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev
...
* commit 'cc9a4e3e2a3716965cd0b76d48e8e840e6ce0f41':
Fix crash when SimpleCursorAdapter changes cursor from null
2012-06-20 22:34:28 -07:00
Adam Powell
09829b71de
Merge "Expand volume APIs for MediaRouter" into jb-dev
2012-06-20 22:32:39 -07:00
Jeff Brown
071ed33487
am fc32ec9a: Merge "Don\'t reset brightness to 0 on initial boot." into jb-dev
...
* commit 'fc32ec9a51cb78e58ae673abc327f4ef7be98fad':
Don't reset brightness to 0 on initial boot.
2012-06-20 22:31:17 -07:00