Daniel Sandler
6499b21d83
am 57e71ebb: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
...
* commit '57e71ebba14068ff7e39b20d9a4f25f40bd57f26':
Reset ExpandHelper when the panel is collapsed.
2012-10-23 08:40:10 -07:00
Daniel Sandler
57e71ebba1
am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
...
* commit '0058f4ed50e5b4bfc8361c18b87115160d7132bb':
Reset ExpandHelper when the panel is collapsed.
2012-10-23 08:37:09 -07:00
Daniel Sandler
0058f4ed50
Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
2012-10-23 08:34:57 -07:00
Daniel Sandler
ac47ff70c3
Reset ExpandHelper when the panel is collapsed.
...
Fixes a rather unpleasant bug in which the ExpandHelper
could get locked in "expanding" mode if the panel was closed
(for example, with the back button) while you were in the
middle of an expand gesture. In this situation ExpandHelper
would hungrily eat all future touch events destined for the
notification panel, making it impossible to click or even
clear any notifications.
Bug: 7330828
Change-Id: I9c493db5e8fd8ef1aca53f77820780d60fa4e5a7
2012-10-23 10:41:44 -04:00
John Spurlock
23fcad7116
am b64150e7: am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
...
* commit 'b64150e7c0f2a7a1d7def675be407481380567d3':
Fix nav bar glitch when quickly turning screen off then on.
2012-10-23 05:51:19 -07:00
John Spurlock
b64150e7c0
am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
...
* commit '780a13b0f43fa5590bb22dc399d9faaf316d66f5':
Fix nav bar glitch when quickly turning screen off then on.
2012-10-23 04:14:03 -07:00
John Spurlock
780a13b0f4
Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
2012-10-23 04:10:29 -07:00
erin rosenthal
a7edbbdd8d
am 76c5144e: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
...
* commit '76c5144ec7b1c80025bc7892ff51939a47c3ca53':
Catch badly formed URLs in WebView accessibility injector.
2012-10-22 17:59:44 -07:00
erin rosenthal
76c5144ec7
am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
...
* commit '36425d19fc578c2042098d2045092990a811d0e6':
Catch badly formed URLs in WebView accessibility injector.
2012-10-22 17:56:27 -07:00
erin rosenthal
36425d19fc
Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
2012-10-22 17:53:27 -07:00
Eric Laurent
bbe897f220
am 5624b30b: am 3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
...
* commit '5624b30b19463e9befd4d1ccb351b2689ff724ce':
reduce camera sound volume.
2012-10-22 17:28:27 -07:00
Eric Laurent
5624b30b19
am 3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
...
* commit '3ac692f5114f058c82ca3855bdd36321f1540be5':
reduce camera sound volume.
2012-10-22 17:26:04 -07:00
Eric Laurent
3ac692f511
Merge "reduce camera sound volume." into jb-mr1-dev
2012-10-22 17:23:20 -07:00
Amith Yamasani
76542206e3
am 9d20663d: am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
...
* commit '9d20663d467a9002a8bb2c12a1edbfe35df2c399':
Set the correct flags for brightness dialog to show on all users
2012-10-22 16:33:42 -07:00
Michael Jurka
061ccc1403
am be26411f: am 4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
...
* commit 'be26411fec36911963f2e4916dab17a372db3bb2':
Solve issue where labels in Recents were blank
2012-10-22 16:30:08 -07:00
Amith Yamasani
9d20663d46
am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
...
* commit '0b828ee0d53980d6f5ce62248cab57f177921fa8':
Set the correct flags for brightness dialog to show on all users
2012-10-22 16:30:00 -07:00
Michael Jurka
be26411fec
am 4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
...
* commit '4ce82df5cc95826d499252f897573f79b514a347':
Solve issue where labels in Recents were blank
2012-10-22 16:26:34 -07:00
Eric Laurent
ef2faae5af
reduce camera sound volume.
...
Reduce new video start and stop sounds volume to
match camera shutter sound volume.
Bug 7377030.
Change-Id: Ic42b36f063006da30dd870fa5ed9c8c5361aa043
2012-10-22 16:26:14 -07:00
Amith Yamasani
0b828ee0d5
Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
2012-10-22 16:25:22 -07:00
Michael Jurka
4ce82df5cc
Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
2012-10-22 16:23:44 -07:00
Kenny Root
3ce8eb4eb2
am 55708a9d: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
...
* commit '55708a9dce5be627f68e388d4ad355595ad5fef5':
Clear data deletes too much
2012-10-22 16:17:17 -07:00
Michael Jurka
fe09ad80bc
Solve issue where labels in Recents were blank
...
Bug: 7352816
Change-Id: Ic0d7f35191ce973a71744aa6ea81351b7bdb8d50
2012-10-22 16:14:26 -07:00
Kenny Root
55708a9dce
am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
...
* commit 'e03c0244717093e0fbc9b05073d3ae3dbd8fcea5':
Clear data deletes too much
2012-10-22 16:14:14 -07:00
Kenny Root
e03c024471
Merge "Clear data deletes too much" into jb-mr1-dev
2012-10-22 16:11:45 -07:00
Amith Yamasani
7ecdc7fd9b
Set the correct flags for brightness dialog to show on all users
...
Earlier fix was writing to the wrong flags.
Bug: 7393822
Change-Id: Ifd51fb30de00be6de381980a05f2769c4283b515
2012-10-22 16:09:58 -07:00
Raph Levien
fdf263971b
am 9defd066: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
...
* commit '9defd0663e2b6a486f5bc72621bbbd4dfab666fb':
Fix for bug: Gmail (and other places): cursor placed on top of letter
2012-10-22 16:01:39 -07:00
Raph Levien
9defd0663e
am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
...
* commit '74437532fe2a3e9ebd15c61327fd3f2b68c299b3':
Fix for bug: Gmail (and other places): cursor placed on top of letter
2012-10-22 15:59:22 -07:00
Raph Levien
74437532fe
Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
2012-10-22 15:56:01 -07:00
Chet Haase
85c1aef929
am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
...
* commit '6534dd0275c8d01de7e7400ba239d203c37c8164':
Don't null the reference to Bitmap pixels until we're really ready
2012-10-22 15:52:20 -07:00
Chet Haase
6534dd0275
am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
...
* commit '74261d847f64ccfeba0a7f08f6c59473a3b6647d':
Don't null the reference to Bitmap pixels until we're really ready
2012-10-22 15:49:22 -07:00
Chet Haase
74261d847f
Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev
2012-10-22 15:46:43 -07:00
Baligh Uddin
dfef8761a4
am 177d984a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '177d984ab91661953259d5329ed01ded5a497d43':
Import translations. DO NOT MERGE
2012-10-22 15:37:19 -07:00
Baligh Uddin
f3e54d692f
am 8d98421f: am 5be59670: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8d98421ff5d6fc31470f7080e6cb5234a60c4036':
Import translations. DO NOT MERGE
2012-10-22 15:34:11 -07:00
Baligh Uddin
177d984ab9
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-22 15:33:14 -07:00
Baligh Uddin
8d98421ff5
am 5be59670: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5be59670c26edf27bfdfdf0430b535dda718bd9d':
Import translations. DO NOT MERGE
2012-10-22 15:31:49 -07:00
Baligh Uddin
5be59670c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-22 15:28:42 -07:00
Chet Haase
547e66531d
Don't null the reference to Bitmap pixels until we're really ready
...
A change in the VM triggers a native memory error more aggressively than before,
showing that there's a bug in the logic of recycling bitmaps. Since the pixel
memory is allocated on the Java heap, nulling out the reference to that memory
in the Java level Bitmap object can cause that memory to get collected at any time.
Meanwhile, we may have a reference to that memory at the native level for rendering
purposes, causing an error if/when we access that memory after it has been collected
by the VM.
The fix is to avoid setting the reference to the pixels to null unless we are
not referring to it in native code. This is determined at the time we call
recycle() - we return a boolean to indicate whether the native code is still
using the memory. if not, the Java code can null out the reference and allow the
VM to collect it. Otherwise, it will get collected later when the encompassing
Bitmap object is collected.
Issue #7339156 HTML5 tests crash the app (Vellamo)
Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
2012-10-22 15:25:19 -07:00
Kenny Root
9157d3f3b7
Clear data deletes too much
...
Bug: 7389445
Change-Id: Ic12d7a8e37747dc1a9b71ec5f881b5e440e0a75e
2012-10-22 15:20:52 -07:00
Raph Levien
42ef515d18
Fix for bug: Gmail (and other places): cursor placed on top of letter
...
This patch fixes bug 7346656. In this particular case, the text line in
the EditText was split into multiple spans, with the boundary between
the "r" and "," in "r,". These were being drawn as two separate runs,
but measured as a single run, leading to inconsistent measurements
because this is a kern pair in Roboto.
The fix is to eliminate the special-case code for measuring. This will
actually improve efficiency, as the value computed in one pass is now
more likely to be reused in another.
Change-Id: I04142a0ec98f280fc1027c7cbdbf903e3096f8e4
2012-10-22 15:01:17 -07:00
Colin Cross
3ebec52947
am 08306ca0: am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
...
* commit '08306ca06025b71c5006e0323c9ff69f7e0d7c4a':
Add ro.revision property to checkin headers
2012-10-22 14:26:05 -07:00
Colin Cross
08306ca060
am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
...
* commit '034b386ccfc42bc9b44e728bb39959c81b1d2e8c':
Add ro.revision property to checkin headers
2012-10-22 14:23:46 -07:00
Colin Cross
034b386ccf
Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
2012-10-22 14:20:06 -07:00
John Spurlock
1bbd49d72e
Fix nav bar glitch when quickly turning screen off then on.
...
Keyguard now disables all navbar buttons when turning screen off
instead of only recents.
Navbar is told about screen off/on and disables the layout transition
animation on screen off - if the user quickly turns the screen back
on they do not see the end of the fade out animation.
Bug:7377776
Change-Id: I96a050d58c6c9ce8537f50408655006fadbfcd4f
2012-10-22 17:10:25 -04:00
Colin Cross
8b2c916a8d
Add ro.revision property to checkin headers
...
Early hardware revisions often have known issues. Add the ro.revision
property to the header for the checkin reports so known issues can
be easily filtered.
Change-Id: I337b09ddfa41ebbe7f8f56223392b0bd491f897b
2012-10-22 14:01:36 -07:00
Jamie Gennis
5bbfcd3e15
am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
Set the secureness when creating displays
2012-10-22 13:54:53 -07:00
Jamie Gennis
9fee7bd73d
am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
2012-10-22 13:52:12 -07:00
Svetoslav Ganov
8ad9c9df00
am a96040a7: am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
...
* commit 'a96040a7d447382a2477df4f5a91b8319c3b6545':
Re-fixing content descritpion on quick settings toggle. Bug: 7362316
2012-10-22 13:51:10 -07:00
Jamie Gennis
23d622418b
Merge "Set the secureness when creating displays" into jb-mr1-dev
2012-10-22 13:49:35 -07:00
Svetoslav Ganov
a96040a7d4
am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
...
* commit 'd07f8d0b373fa4581c6b11738931c8f9fbd79ac7':
Re-fixing content descritpion on quick settings toggle. Bug: 7362316
2012-10-22 13:48:16 -07:00
Svetoslav Ganov
d07f8d0b37
Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
2012-10-22 13:45:13 -07:00