OSDN Git Service
Baligh Uddin [Tue, 23 Oct 2012 18:21:57 +0000 (11:21 -0700)]
am
8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8ed482224ccd9d43fbb7544379a9bb7c10554419':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 18:20:02 +0000 (11:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Tue, 23 Oct 2012 18:19:03 +0000 (11:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Romain Guy [Tue, 23 Oct 2012 17:51:01 +0000 (10:51 -0700)]
am
04c8d402: Merge "Properly draw the window background on window resize Bug #
7385090" into jb-mr1-dev
* commit '
04c8d402fa824c548dc5de82c56e63eb5df02371':
Properly draw the window background on window resize Bug #
7385090
Irfan Sheriff [Tue, 23 Oct 2012 17:49:16 +0000 (10:49 -0700)]
am
c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
* commit '
c48ca657f801b120e88c94287cdeecddc1a46e88':
Fix driver stop handling
Romain Guy [Tue, 23 Oct 2012 17:47:56 +0000 (10:47 -0700)]
Merge "Properly draw the window background on window resize Bug #
7385090" into jb-mr1-dev
Irfan Sheriff [Tue, 23 Oct 2012 17:45:41 +0000 (10:45 -0700)]
Merge "Fix driver stop handling" into jb-mr1-dev
Baligh Uddin [Tue, 23 Oct 2012 17:42:49 +0000 (10:42 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Tue, 23 Oct 2012 17:42:17 +0000 (10:42 -0700)]
am
21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
21ce854b50667bf675bc36ce0db1a3d6f0a2ab92':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 17:39:26 +0000 (10:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Irfan Sheriff [Tue, 23 Oct 2012 17:22:13 +0000 (10:22 -0700)]
Fix driver stop handling
Defer supplicant state change event so we do not miss it
Bug:
7394390
Change-Id: Ibae6cef6be42a6cb45dc20ba4fa5060d8e459217
Baligh Uddin [Tue, 23 Oct 2012 17:36:05 +0000 (10:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1848f36834beea6d08e296aff9de39435482f75
Auto-generated-cl: translation import
Daniel Sandler [Tue, 23 Oct 2012 17:35:13 +0000 (10:35 -0700)]
am
365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
365ece1dd04df936b51e739ba3dde5fb94b3e527':
Dreams/Sleep Mode is now Daydreams.
Baligh Uddin [Tue, 23 Oct 2012 17:34:11 +0000 (10:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I349b6bc4c17141a0ac74e50b573382a2cf694f7e
Auto-generated-cl: translation import
Daniel Sandler [Tue, 23 Oct 2012 17:31:22 +0000 (10:31 -0700)]
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
Baligh Uddin [Tue, 23 Oct 2012 17:06:53 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia49d738d4c123d06cc8ef2a31a18aa7156816d26
Auto-generated-cl: translation import
Justin Ho [Tue, 23 Oct 2012 17:05:22 +0000 (10:05 -0700)]
am
5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
* commit '
5d6562d34cb088f3468021b8bbdf8d75b68dca68':
Avoid mentioning hidden API in docs.
Baligh Uddin [Tue, 23 Oct 2012 17:03:00 +0000 (10:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6d7f8dec6e1115a4586befbaa302eafe606fb901
Auto-generated-cl: translation import
Justin Ho [Tue, 23 Oct 2012 16:41:43 +0000 (09:41 -0700)]
Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
Irfan Sheriff [Tue, 23 Oct 2012 16:38:41 +0000 (09:38 -0700)]
am
bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
* commit '
bf310d1f6ef4ac167f66a4e31724c7766981bd84':
Fix issues shown on CTS tests
Jeff Sharkey [Tue, 23 Oct 2012 16:37:54 +0000 (09:37 -0700)]
Avoid mentioning hidden API in docs.
Change-Id: If83c179ec0d1b038e94a7fdca386c8ddf324e391
Irfan Sheriff [Tue, 23 Oct 2012 16:36:44 +0000 (09:36 -0700)]
Merge "Fix issues shown on CTS tests" into jb-mr1-dev
Irfan Sheriff [Mon, 22 Oct 2012 23:28:02 +0000 (16:28 -0700)]
Fix issues shown on CTS tests
Reset timeout for single interface architecture
Fix persistence reinvocation handling on the receive side
Bug:
7379336
Change-Id: Iacca0bd6dcbeb42af63bf2078e8cf3126e4e74a7
Jeff Sharkey [Tue, 23 Oct 2012 16:11:10 +0000 (09:11 -0700)]
am
1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
* commit '
1c8135adba37ac09fe661180237df446611daa4b':
Update docs for multi-user storage behavior.
Jeff Sharkey [Tue, 23 Oct 2012 16:08:41 +0000 (09:08 -0700)]
Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
Daniel Sandler [Tue, 23 Oct 2012 15:37:23 +0000 (08:37 -0700)]
am
0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
* commit '
0058f4ed50e5b4bfc8361c18b87115160d7132bb':
Reset ExpandHelper when the panel is collapsed.
Daniel Sandler [Tue, 23 Oct 2012 15:34:55 +0000 (08:34 -0700)]
Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
Daniel Sandler [Tue, 23 Oct 2012 14:41:44 +0000 (10:41 -0400)]
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
John Spurlock [Tue, 23 Oct 2012 11:14:11 +0000 (04:14 -0700)]
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.
John Spurlock [Tue, 23 Oct 2012 11:10:28 +0000 (04:10 -0700)]
Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
Daniel Sandler [Tue, 23 Oct 2012 05:21:33 +0000 (01:21 -0400)]
Dreams/Sleep Mode is now Daydreams.
Bug:
7395321
Change-Id: I3173cd9205df94217911a2d432d1be1db9e3d539
Jim Miller [Tue, 23 Oct 2012 03:45:56 +0000 (20:45 -0700)]
Merge multi-user stuff from prototype into framework.
Change-Id: I195b588ecfcea3388a2489fe7278a851202380c6
Romain Guy [Tue, 23 Oct 2012 03:02:43 +0000 (20:02 -0700)]
Properly draw the window background on window resize
Bug #
7385090
This change gets rid of two silly asumptions:
- That a layer needs to be cleared with opaque black (it shouldn't,
it's already cleared to transparent and the view will cover it up
with its own background)
- The the clip should be dirty at the beginning of a frame only
when the render target is opaque
Change-Id: I415b6d3cab196057fb0281419a53fef601a44e28
Jim Miller [Tue, 23 Oct 2012 02:03:06 +0000 (19:03 -0700)]
Merge latest prototype changes into keyguard
- multi-user avatar stuff.
- new SlidingChallengeLayout changes.
Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25
Jim Miller [Tue, 23 Oct 2012 01:52:37 +0000 (18:52 -0700)]
Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev
erin rosenthal [Tue, 23 Oct 2012 00:56:27 +0000 (17:56 -0700)]
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.
erin rosenthal [Tue, 23 Oct 2012 00:53:26 +0000 (17:53 -0700)]
Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
Eric Laurent [Tue, 23 Oct 2012 00:26:06 +0000 (17:26 -0700)]
am
3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
* commit '
3ac692f5114f058c82ca3855bdd36321f1540be5':
reduce camera sound volume.
Eric Laurent [Tue, 23 Oct 2012 00:23:20 +0000 (17:23 -0700)]
Merge "reduce camera sound volume." into jb-mr1-dev
Jim Miller [Mon, 22 Oct 2012 23:49:52 +0000 (16:49 -0700)]
Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
The show() method was calling onScreenTurnedOn() which attempted
to update the entire state.
Instead, show() should just ensure the current security screen
is showing.
This was causing some mischief in Face Unlock because onResume() was
being called multiple times.
Change-Id: I39682a213b1cc4dcf8133907b643028e844d0f47
Amith Yamasani [Mon, 22 Oct 2012 23:30:19 +0000 (16:30 -0700)]
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
Eric Laurent [Mon, 22 Oct 2012 23:26:14 +0000 (16:26 -0700)]
reduce camera sound volume.
Reduce new video start and stop sounds volume to
match camera shutter sound volume.
Bug
7377030.
Change-Id: Ic42b36f063006da30dd870fa5ed9c8c5361aa043
Michael Jurka [Mon, 22 Oct 2012 23:25:40 +0000 (16:25 -0700)]
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
Amith Yamasani [Mon, 22 Oct 2012 23:25:20 +0000 (16:25 -0700)]
Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
Michael Jurka [Mon, 22 Oct 2012 23:23:43 +0000 (16:23 -0700)]
Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
Michael Jurka [Mon, 22 Oct 2012 20:58:38 +0000 (13:58 -0700)]
Solve issue where labels in Recents were blank
Bug:
7352816
Change-Id: Ic0d7f35191ce973a71744aa6ea81351b7bdb8d50
Kenny Root [Mon, 22 Oct 2012 23:13:45 +0000 (16:13 -0700)]
am
e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
* commit '
e03c0244717093e0fbc9b05073d3ae3dbd8fcea5':
Clear data deletes too much
Kenny Root [Mon, 22 Oct 2012 23:11:44 +0000 (16:11 -0700)]
Merge "Clear data deletes too much" into jb-mr1-dev
Amith Yamasani [Mon, 22 Oct 2012 23:09:58 +0000 (16:09 -0700)]
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
Raph Levien [Mon, 22 Oct 2012 22:59:14 +0000 (15:59 -0700)]
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
Raph Levien [Mon, 22 Oct 2012 22:56:01 +0000 (15:56 -0700)]
Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
Chet Haase [Mon, 22 Oct 2012 22:50:08 +0000 (15:50 -0700)]
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
Chet Haase [Mon, 22 Oct 2012 22:46:43 +0000 (15:46 -0700)]
Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 22:34:57 +0000 (15:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 22 Oct 2012 22:31:10 +0000 (15:31 -0700)]
am
5be59670: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5be59670c26edf27bfdfdf0430b535dda718bd9d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 22:28:34 +0000 (15:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Chet Haase [Mon, 22 Oct 2012 22:07:26 +0000 (15:07 -0700)]
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
Kenny Root [Mon, 22 Oct 2012 22:19:16 +0000 (15:19 -0700)]
Clear data deletes too much
Bug:
7389445
Change-Id: Ic12d7a8e37747dc1a9b71ec5f881b5e440e0a75e
Jeff Sharkey [Mon, 22 Oct 2012 21:08:29 +0000 (14:08 -0700)]
Update docs for multi-user storage behavior.
Define external storage as being isolated for each user, with the
caveat for shared OBB files. Also mention external storage
permissions.
Bug:
7384941
Change-Id: Ib156b5874c5587749d7bc066791e9e88d931b174
Raph Levien [Mon, 22 Oct 2012 22:01:17 +0000 (15:01 -0700)]
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
Colin Cross [Mon, 22 Oct 2012 21:23:18 +0000 (14:23 -0700)]
am
034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
* commit '
034b386ccfc42bc9b44e728bb39959c81b1d2e8c':
Add ro.revision property to checkin headers
Colin Cross [Mon, 22 Oct 2012 21:20:06 +0000 (14:20 -0700)]
Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
John Spurlock [Fri, 19 Oct 2012 15:09:32 +0000 (11:09 -0400)]
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
Colin Cross [Mon, 22 Oct 2012 21:01:36 +0000 (14:01 -0700)]
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
Jamie Gennis [Mon, 22 Oct 2012 20:52:22 +0000 (13:52 -0700)]
am
23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
* commit '
23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
Jamie Gennis [Mon, 22 Oct 2012 20:49:34 +0000 (13:49 -0700)]
Merge "Set the secureness when creating displays" into jb-mr1-dev
Svetoslav Ganov [Mon, 22 Oct 2012 20:48:27 +0000 (13:48 -0700)]
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
Svetoslav Ganov [Mon, 22 Oct 2012 20:45:12 +0000 (13:45 -0700)]
Merge "Re-fixing content descritpion on quick settings toggle. Bug:
7362316" into jb-mr1-dev
Victoria Lease [Mon, 22 Oct 2012 20:41:21 +0000 (13:41 -0700)]
am
92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
* commit '
92d9922370ffe50932361602f46b275d085e61b8':
LocationManager javadoc permission fixes
Victoria Lease [Mon, 22 Oct 2012 20:38:09 +0000 (13:38 -0700)]
Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
Amith Yamasani [Mon, 22 Oct 2012 20:34:29 +0000 (13:34 -0700)]
am
22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
* commit '
2278898126c1cea4bd345bb96313d381b4ad3993':
System server should always send broadcasts to a specific or all users
Amith Yamasani [Mon, 22 Oct 2012 20:32:23 +0000 (13:32 -0700)]
Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
Victoria Lease [Mon, 22 Oct 2012 16:30:07 +0000 (09:30 -0700)]
LocationManager javadoc permission fixes
The javadoc mistakenly claimed that GPS and PASSIVE location
providers could be used with ACCESS_COARSE_LOCATION permissions.
That was incorrect, and the javadoc has been amended.
Bug:
7389249
Change-Id: I6f6489bb539679a962c67ae7263857700df33c82
Amith Yamasani [Sat, 20 Oct 2012 01:23:52 +0000 (18:23 -0700)]
System server should always send broadcasts to a specific or all users
Bug:
7368245
Log a warning if the system process calls unqualified sendBroadcast()
and other calls.
As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.
Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
Adam Powell [Mon, 22 Oct 2012 19:31:34 +0000 (12:31 -0700)]
am
cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
* commit '
cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
Remove View's long press callbacks when ACTION_CANCEL is received
Adam Powell [Mon, 22 Oct 2012 19:29:02 +0000 (12:29 -0700)]
Merge "Remove View's long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
Daniel Sandler [Mon, 22 Oct 2012 19:17:26 +0000 (12:17 -0700)]
am
a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
* commit '
a4be1b2bcdc768708f594b69923986617a367820':
Fix empty notification panel.
Adam Powell [Mon, 22 Oct 2012 19:15:49 +0000 (12:15 -0700)]
Remove View's long press callbacks when ACTION_CANCEL is received
Bug
7391646
Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
Daniel Sandler [Mon, 22 Oct 2012 19:15:35 +0000 (12:15 -0700)]
am
564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
* commit '
564c03dac59ecd2255bba658b254fd1f5672ec22':
Really hide the settings button on tablets.
Daniel Sandler [Mon, 22 Oct 2012 19:12:51 +0000 (12:12 -0700)]
Merge "Fix empty notification panel." into jb-mr1-dev
Daniel Sandler [Mon, 22 Oct 2012 19:12:48 +0000 (12:12 -0700)]
Merge "Really hide the settings button on tablets." into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 19:01:02 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I51415c91026c1ea461f1b1239a75ec999fd7fe0c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 19:00:30 +0000 (12:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iecf97b4e7ed628d9617fae86007efa7236c3fe15
Auto-generated-cl: translation import
Daniel Sandler [Mon, 22 Oct 2012 18:47:55 +0000 (14:47 -0400)]
Fix empty notification panel.
If the panel closed before the flip animation completed, you
would have had a bad time.
Bug:
7391510
Change-Id: I45c29de45b718bc63e7be1a5544c1f73ac6f46e0
Daniel Sandler [Mon, 22 Oct 2012 18:36:50 +0000 (14:36 -0400)]
Really hide the settings button on tablets.
Bug:
7382185
Change-Id: Id452e2499ba2089b8cfb0071b6aedf6d1d917b35
Michael Jurka [Mon, 22 Oct 2012 18:16:26 +0000 (11:16 -0700)]
am
39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
* commit '
39c6526249a27b9dd9252910adecf8353b0792f0':
Add NPE check to fix crash in Recents
Michael Jurka [Mon, 22 Oct 2012 18:12:01 +0000 (11:12 -0700)]
Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
Michael Jurka [Mon, 22 Oct 2012 17:56:18 +0000 (10:56 -0700)]
Add NPE check to fix crash in Recents
Bug:
7383315
Baligh Uddin [Mon, 22 Oct 2012 17:44:21 +0000 (10:44 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Jeff Brown [Mon, 22 Oct 2012 17:40:21 +0000 (10:40 -0700)]
am
d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
* commit '
d6e3ad54907ec085aa41e5c77296e9f385c22e67':
Reduce screen on/off latency.
Jeff Brown [Mon, 22 Oct 2012 17:36:58 +0000 (10:36 -0700)]
Merge "Reduce screen on/off latency." into jb-mr1-dev
Dianne Hackborn [Mon, 22 Oct 2012 17:32:19 +0000 (10:32 -0700)]
am
f584f111: Merge "Fix issue #
7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
* commit '
f584f1112772fdffce13cba38995b9e28adca191':
Fix issue #
7353900: Brief flash of home screen while dream starts on lock screen.
Baligh Uddin [Mon, 22 Oct 2012 17:32:16 +0000 (10:32 -0700)]
am
e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e53f5265d17a14cdb36859779e16ddb1c1a76338':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 17:30:10 +0000 (10:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Dianne Hackborn [Mon, 22 Oct 2012 17:29:02 +0000 (10:29 -0700)]
Merge "Fix issue #
7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 17:28:21 +0000 (10:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 17:05:55 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I148660f9239763887c14970ff0cfc574e0ae0251
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 16:46:16 +0000 (09:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0e70aeaf47180803a74a258143ba462e487b0d4f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 16:44:44 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02aa0e6fa545b325429029f58d19247b9d3f3373
Auto-generated-cl: translation import
Daniel Sandler [Mon, 22 Oct 2012 15:19:06 +0000 (08:19 -0700)]
am
cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
* commit '
cc0106cd99831ce7d3715e3c85e5b3e6c5c6ca78':
Properly show emoji in the notification ticker.